Arthur de Jong

Open Source / Free Software developer

summaryrefslogtreecommitdiffstats
path: root/nslcd
diff options
context:
space:
mode:
authorArthur de Jong <arthur@arthurdejong.org>2009-05-21 13:24:59 +0200
committerArthur de Jong <arthur@arthurdejong.org>2009-05-21 13:24:59 +0200
commit93f8aa6e04b76a23b0409e3a73b86e7fd318377d (patch)
tree0351e870cbd4d09547a3c2dcd68742574dd90215 /nslcd
parentba6e3033a966572a9b44eaae8d0284ca33204583 (diff)
refactor protocol reading and writing macros to the common directory, use more logical names and in the PAM module no longer use NSS status codes
git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-pam-ldapd@887 ef36b2f9-881f-0410-afb5-c4e39611909c
Diffstat (limited to 'nslcd')
-rw-r--r--nslcd/Makefile.am2
-rw-r--r--nslcd/alias.c2
-rw-r--r--nslcd/common.h2
-rw-r--r--nslcd/ether.c2
-rw-r--r--nslcd/group.c4
-rw-r--r--nslcd/host.c2
-rw-r--r--nslcd/netgroup.c2
-rw-r--r--nslcd/network.c2
-rw-r--r--nslcd/pam.c46
-rw-r--r--nslcd/passwd.c2
-rw-r--r--nslcd/protocol.c2
-rw-r--r--nslcd/rpc.c2
-rw-r--r--nslcd/service.c6
-rw-r--r--nslcd/shadow.c2
14 files changed, 39 insertions, 39 deletions
diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index 4e841a5..bdf3150 100644
--- a/nslcd/Makefile.am
+++ b/nslcd/Makefile.am
@@ -23,7 +23,7 @@ sbin_PROGRAMS = nslcd
AM_CPPFLAGS=-I$(top_srcdir)
AM_CFLAGS = $(PTHREAD_CFLAGS)
-nslcd_SOURCES = nslcd.c ../nslcd.h ../nslcd-common.h \
+nslcd_SOURCES = nslcd.c ../nslcd.h ../common/nslcd-prot.h \
../compat/attrs.h \
log.c log.h \
common.c common.h \
diff --git a/nslcd/alias.c b/nslcd/alias.c
index c59af95..337a06d 100644
--- a/nslcd/alias.c
+++ b/nslcd/alias.c
@@ -128,7 +128,7 @@ NSLCD_HANDLE(
alias,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_alias_byname(%s)",name);,
NSLCD_ACTION_ALIAS_BYNAME,
mkfilter_alias_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/common.h b/nslcd/common.h
index 1219066..0fcf7f7 100644
--- a/nslcd/common.h
+++ b/nslcd/common.h
@@ -25,7 +25,7 @@
#define _SERVER_COMMON_H 1
#include "nslcd.h"
-#include "nslcd-common.h"
+#include "common/nslcd-prot.h"
#include "common/tio.h"
#include "compat/attrs.h"
#include "myldap.h"
diff --git a/nslcd/ether.c b/nslcd/ether.c
index 7133719..aee7d53 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -171,7 +171,7 @@ NSLCD_HANDLE(
ether,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_ether_byname(%s)",name);,
NSLCD_ACTION_ETHER_BYNAME,
mkfilter_ether_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/group.c b/nslcd/group.c
index 686a1d5..70dfa53 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -300,7 +300,7 @@ NSLCD_HANDLE(
group,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));
+ READ_STRING(fp,name);
if (!isvalidname(name)) {
log_log(LOG_WARNING,"nslcd_group_byname(%s): invalid group name",name);
return -1;
@@ -326,7 +326,7 @@ NSLCD_HANDLE(
group,bymember,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));
+ READ_STRING(fp,name);
if (!isvalidname(name)) {
log_log(LOG_WARNING,"nslcd_group_bymember(%s): invalid user name",name);
return -1;
diff --git a/nslcd/host.c b/nslcd/host.c
index d7eba7a..e80548b 100644
--- a/nslcd/host.c
+++ b/nslcd/host.c
@@ -153,7 +153,7 @@ NSLCD_HANDLE(
host,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_host_byname(%s)",name);,
NSLCD_ACTION_HOST_BYNAME,
mkfilter_host_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/netgroup.c b/nslcd/netgroup.c
index 8f380a8..c45927c 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -232,7 +232,7 @@ NSLCD_HANDLE(
netgroup,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_netgroup_byname(%s)",name);,
NSLCD_ACTION_NETGROUP_BYNAME,
mkfilter_netgroup_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/network.c b/nslcd/network.c
index f5e7a44..06c9c42 100644
--- a/nslcd/network.c
+++ b/nslcd/network.c
@@ -152,7 +152,7 @@ NSLCD_HANDLE(
network,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_network_byname(%s)",name);,
NSLCD_ACTION_NETWORK_BYNAME,
mkfilter_network_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/pam.c b/nslcd/pam.c
index c074bdc..72a7b71 100644
--- a/nslcd/pam.c
+++ b/nslcd/pam.c
@@ -77,10 +77,10 @@ int nslcd_pam_authc(TFILE *fp,MYLDAP_SESSION *session)
char servicename[64];
char password[64];
/* read request parameters */
- READ_STRING_BUF2(fp,username,sizeof(username));
- READ_STRING_BUF2(fp,userdn,sizeof(userdn));
- READ_STRING_BUF2(fp,servicename,sizeof(servicename));
- READ_STRING_BUF2(fp,password,sizeof(password));
+ READ_STRING(fp,username);
+ READ_STRING(fp,userdn);
+ READ_STRING(fp,servicename);
+ READ_STRING(fp,password);
/* log call */
log_log(LOG_DEBUG,"nslcd_pam_authc(\"%s\",\"%s\",\"%s\")",username,userdn,servicename);
/* write the response header */
@@ -139,9 +139,9 @@ int nslcd_pam_authz(TFILE *fp,MYLDAP_SESSION *session)
char userdn[256];
char servicename[64];
/* read request parameters */
- READ_STRING_BUF2(fp,username,sizeof(username));
- READ_STRING_BUF2(fp,userdn,sizeof(userdn));
- READ_STRING_BUF2(fp,servicename,sizeof(servicename));
+ READ_STRING(fp,username);
+ READ_STRING(fp,userdn);
+ READ_STRING(fp,servicename);
/* log call */
log_log(LOG_DEBUG,"nslcd_pam_authz(\"%s\",\"%s\",\"%s\")",username,userdn,servicename);
/* write the response header */
@@ -209,12 +209,12 @@ int nslcd_pam_sess_o(TFILE *fp,MYLDAP_SESSION *session)
char tty[64],rhost[64],ruser[256];
int32_t sessionid;
/* read request parameters */
- READ_STRING_BUF2(fp,username,sizeof(username));
- READ_STRING_BUF2(fp,userdn,sizeof(userdn));
- READ_STRING_BUF2(fp,servicename,sizeof(servicename));
- READ_STRING_BUF2(fp,tty,sizeof(tty));
- READ_STRING_BUF2(fp,rhost,sizeof(rhost));
- READ_STRING_BUF2(fp,ruser,sizeof(ruser));
+ READ_STRING(fp,username);
+ READ_STRING(fp,userdn);
+ READ_STRING(fp,servicename);
+ READ_STRING(fp,tty);
+ READ_STRING(fp,rhost);
+ READ_STRING(fp,ruser);
READ_INT32(fp,sessionid);
/* log call */
log_log(LOG_DEBUG,"nslcd_pam_sess_o(\"%s\",\"%s\",\"%s\",\"%s\",\"%s\",\"%s\")",
@@ -238,12 +238,12 @@ int nslcd_pam_sess_c(TFILE *fp,MYLDAP_SESSION *session)
char tty[64],rhost[64],ruser[256];
int32_t sessionid;
/* read request parameters */
- READ_STRING_BUF2(fp,username,sizeof(username));
- READ_STRING_BUF2(fp,userdn,sizeof(userdn));
- READ_STRING_BUF2(fp,servicename,sizeof(servicename));
- READ_STRING_BUF2(fp,tty,sizeof(tty));
- READ_STRING_BUF2(fp,rhost,sizeof(rhost));
- READ_STRING_BUF2(fp,ruser,sizeof(ruser));
+ READ_STRING(fp,username);
+ READ_STRING(fp,userdn);
+ READ_STRING(fp,servicename);
+ READ_STRING(fp,tty);
+ READ_STRING(fp,rhost);
+ READ_STRING(fp,ruser);
READ_INT32(fp,sessionid);
/* log call */
log_log(LOG_DEBUG,"nslcd_pam_sess_c(\"%s\",\"%s\",\"%s\",%d)",
@@ -268,16 +268,16 @@ int nslcd_pam_pwmod(TFILE *fp,MYLDAP_SESSION *session)
char opwc[256];
char npwc[256];
- READ_STRING_BUF2(fp,dnc,sizeof(dnc));
+ READ_STRING(fp,dnc);
dn.bv_val = dnc;
dn.bv_len = tmpint32;
- READ_STRING_BUF2(fp,uidc,sizeof(uidc));
+ READ_STRING(fp,uidc);
uid.bv_val = uidc;
uid.bv_len = tmpint32;
- READ_STRING_BUF2(fp,opwc,sizeof(opwc));
+ READ_STRING(fp,opwc);
opw.bv_val = opwc;
opw.bv_len = tmpint32;
- READ_STRING_BUF2(fp,npwc,sizeof(npwc));
+ READ_STRING(fp,npwc);
npw.bv_val = npwc;
npw.bv_len = tmpint32;
diff --git a/nslcd/passwd.c b/nslcd/passwd.c
index 1f2f657..2b80de3 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -461,7 +461,7 @@ NSLCD_HANDLE(
passwd,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));
+ READ_STRING(fp,name);
if (!isvalidname(name)) {
log_log(LOG_WARNING,"nslcd_passwd_byname(%s): invalid user name",name);
return -1;
diff --git a/nslcd/protocol.c b/nslcd/protocol.c
index f83f423..166bc83 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -151,7 +151,7 @@ NSLCD_HANDLE(
protocol,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_protocol_byname(%s)",name);,
NSLCD_ACTION_PROTOCOL_BYNAME,
mkfilter_protocol_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/rpc.c b/nslcd/rpc.c
index 3dc99d2..13fbd32 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -152,7 +152,7 @@ NSLCD_HANDLE(
rpc,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_rpc_byname(%s)",name);,
NSLCD_ACTION_RPC_BYNAME,
mkfilter_rpc_byname(name,filter,sizeof(filter)),
diff --git a/nslcd/service.c b/nslcd/service.c
index 845ff50..dd073f8 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -203,8 +203,8 @@ NSLCD_HANDLE(
char name[256];
char protocol[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));
- READ_STRING_BUF2(fp,protocol,sizeof(protocol));,
+ READ_STRING(fp,name);
+ READ_STRING(fp,protocol);,
log_log(LOG_DEBUG,"nslcd_service_byname(%s,%s)",name,protocol);,
NSLCD_ACTION_SERVICE_BYNAME,
mkfilter_service_byname(name,protocol,filter,sizeof(filter)),
@@ -217,7 +217,7 @@ NSLCD_HANDLE(
char protocol[256];
char filter[1024];
READ_INT32(fp,number);
- READ_STRING_BUF2(fp,protocol,sizeof(protocol));,
+ READ_STRING(fp,protocol);,
log_log(LOG_DEBUG,"nslcd_service_bynumber(%d,%s)",number,protocol);,
NSLCD_ACTION_SERVICE_BYNUMBER,
mkfilter_service_bynumber(number,protocol,filter,sizeof(filter)),
diff --git a/nslcd/shadow.c b/nslcd/shadow.c
index a8392f9..9a5388d 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -266,7 +266,7 @@ NSLCD_HANDLE(
shadow,byname,
char name[256];
char filter[1024];
- READ_STRING_BUF2(fp,name,sizeof(name));,
+ READ_STRING(fp,name);,
log_log(LOG_DEBUG,"nslcd_shadow_byname(%s)",name);,
NSLCD_ACTION_SHADOW_BYNAME,
mkfilter_shadow_byname(name,filter,sizeof(filter)),