nss_ldapd/files/patch-nslcd__common.h

--- ./nslcd/common.h.orig       2009-06-03 10:31:05.000000000 +0000
+++ ./nslcd/common.h    2009-08-02 22:32:27.000000000 +0000
@@ -124,9 +124,9 @@
 int nslcd_network_byname(TFILE *fp,MYLDAP_SESSION *session);
 int nslcd_network_byaddr(TFILE *fp,MYLDAP_SESSION *session);
 int nslcd_network_all(TFILE *fp,MYLDAP_SESSION *session);
-int nslcd_passwd_byname(TFILE *fp,MYLDAP_SESSION *session);
-int nslcd_passwd_byuid(TFILE *fp,MYLDAP_SESSION *session);
-int nslcd_passwd_all(TFILE *fp,MYLDAP_SESSION *session);
+int nslcd_passwd_byname(TFILE *fp,MYLDAP_SESSION *session,uid_t uid);
+int nslcd_passwd_byuid(TFILE *fp,MYLDAP_SESSION *session,uid_t uid);
+int nslcd_passwd_all(TFILE *fp,MYLDAP_SESSION *session,uid_t uid);
 int nslcd_protocol_byname(TFILE *fp,MYLDAP_SESSION *session);
 int nslcd_protocol_bynumber(TFILE *fp,MYLDAP_SESSION *session);
 int nslcd_protocol_all(TFILE *fp,MYLDAP_SESSION *session);
@@ -145,8 +145,12 @@
 int nslcd_pam_pwmod(TFILE *fp,MYLDAP_SESSION *session);
 
 /* macro for generating service handling code */
-#define NSLCD_HANDLE(db,fn,readfn,logcall,action,mkfilter,writefn) \
-  int nslcd_##db##_##fn(TFILE *fp,MYLDAP_SESSION *session) \
+#define COMMA  ,
+#define NSLCD_HANDLE(db,fn,readfn,logcall,action,mkfilter,writefn)     NSLCD_HANDLE_PARAMS(db,fn,,readfn,logcall,action,mkfilter,writefn)
+#define NSLCD_HANDLE_UID(db,fn,readfn,logcall,action,mkfilter,writefn) NSLCD_HANDLE_PARAMS(db,fn,COMMA uid_t calleruid,readfn,logcall,action,mkfilter,writefn)
+
+#define NSLCD_HANDLE_PARAMS(db,fn,params,readfn,logcall,action,mkfilter,writefn) \
+  int nslcd_##db##_##fn(TFILE *fp,MYLDAP_SESSION *session params ) \
   { \
     /* define common variables */ \
     int32_t tmpint32; \
Revision:	101
Committed:	2009-08-22T17:48:38-07:00 (15 years, 10 months ago) by douglas
Content type:	text/x-diff
File size:	1697 byte(s)
Log Message:	Pull in net/nss_ldapd before fixing its rc.d script.
#	Content
1	--- ./nslcd/common.h.orig 2009-06-03 10:31:05.000000000 +0000
2	+++ ./nslcd/common.h 2009-08-02 22:32:27.000000000 +0000
3	@@ -124,9 +124,9 @@
4	int nslcd_network_byname(TFILE fp,MYLDAP_SESSION session);
5	int nslcd_network_byaddr(TFILE fp,MYLDAP_SESSION session);
6	int nslcd_network_all(TFILE fp,MYLDAP_SESSION session);
7	-int nslcd_passwd_byname(TFILE fp,MYLDAP_SESSION session);
8	-int nslcd_passwd_byuid(TFILE fp,MYLDAP_SESSION session);
9	-int nslcd_passwd_all(TFILE fp,MYLDAP_SESSION session);
10	+int nslcd_passwd_byname(TFILE fp,MYLDAP_SESSION session,uid_t uid);
11	+int nslcd_passwd_byuid(TFILE fp,MYLDAP_SESSION session,uid_t uid);
12	+int nslcd_passwd_all(TFILE fp,MYLDAP_SESSION session,uid_t uid);
13	int nslcd_protocol_byname(TFILE fp,MYLDAP_SESSION session);
14	int nslcd_protocol_bynumber(TFILE fp,MYLDAP_SESSION session);
15	int nslcd_protocol_all(TFILE fp,MYLDAP_SESSION session);
16	@@ -145,8 +145,12 @@
17	int nslcd_pam_pwmod(TFILE fp,MYLDAP_SESSION session);
18
19	/* macro for generating service handling code */
20	-#define NSLCD_HANDLE(db,fn,readfn,logcall,action,mkfilter,writefn) \
21	- int nslcd_##db##_##fn(TFILE fp,MYLDAP_SESSION session) \
22	+#define COMMA ,
23	+#define NSLCD_HANDLE(db,fn,readfn,logcall,action,mkfilter,writefn) NSLCD_HANDLE_PARAMS(db,fn,,readfn,logcall,action,mkfilter,writefn)
24	+#define NSLCD_HANDLE_UID(db,fn,readfn,logcall,action,mkfilter,writefn) NSLCD_HANDLE_PARAMS(db,fn,COMMA uid_t calleruid,readfn,logcall,action,mkfilter,writefn)
25	+
26	+#define NSLCD_HANDLE_PARAMS(db,fn,params,readfn,logcall,action,mkfilter,writefn) \
27	+ int nslcd_##db##_##fn(TFILE fp,MYLDAP_SESSION session params ) \
28	{ \
29	/* define common variables */ \
30	int32_t tmpint32; \