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 (import of r887 from nss-pam-ldapd)

git-svn-id: http://arthurdejong.org/svn/nss-pam-ldapd/nss-ldapd@904 ef36b2f9-881f-0410-afb5-c4e39611909c

13 files changed, 16 insertions, 16 deletions

diff --git a/nslcd/Makefile.am b/nslcd/Makefile.am
index 217d369..d36d0fb 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 42a880c..bcdd48a 100644
--- a/nslcd/alias.c
+++ b/nslcd/alias.c
@@ -130,7 +130,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 cf49625..9fc56fa 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 0f8ca94..1bfa200 100644
--- a/nslcd/ether.c
+++ b/nslcd/ether.c
@@ -173,7 +173,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 fa83de4..6bb7e8c 100644
--- a/nslcd/group.c
+++ b/nslcd/group.c
@@ -302,7 +302,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;
@@ -328,7 +328,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 db27fa4..63826d5 100644
--- a/nslcd/host.c
+++ b/nslcd/host.c
@@ -155,7 +155,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 6ba4e11..6c38216 100644
--- a/nslcd/netgroup.c
+++ b/nslcd/netgroup.c
@@ -234,7 +234,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 a7a49d2..c2bcce2 100644
--- a/nslcd/network.c
+++ b/nslcd/network.c
@@ -154,7 +154,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/passwd.c b/nslcd/passwd.c
index 2b105d6..d140de3 100644
--- a/nslcd/passwd.c
+++ b/nslcd/passwd.c
@@ -462,7 +462,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 5162bfd..595427b 100644
--- a/nslcd/protocol.c
+++ b/nslcd/protocol.c
@@ -153,7 +153,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 0a2c6e4..7480b4f 100644
--- a/nslcd/rpc.c
+++ b/nslcd/rpc.c
@@ -154,7 +154,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 b6888e7..64129ca 100644
--- a/nslcd/service.c
+++ b/nslcd/service.c
@@ -205,8 +205,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)),
@@ -219,7 +219,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 0da00cd..ff46355 100644
--- a/nslcd/shadow.c
+++ b/nslcd/shadow.c
@@ -268,7 +268,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)),