svn commit: samba r25871 - in branches/SAMBA_4_0/source/lib/nss_wrapper: .

[metze at samba.org]

Author: metze
Date: 2007-11-06 12:11:35 +0000 (Tue, 06 Nov 2007)
New Revision: 25871

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=25871

Log:
nss_wrapper: set the destination pointer in the get*_r functions

metze
Modified:
   branches/SAMBA_4_0/source/lib/nss_wrapper/nss_wrapper.c


Changeset:
Modified: branches/SAMBA_4_0/source/lib/nss_wrapper/nss_wrapper.c
===================================================================
--- branches/SAMBA_4_0/source/lib/nss_wrapper/nss_wrapper.c	2007-11-06 10:40:07 UTC (rev 25870)
+++ branches/SAMBA_4_0/source/lib/nss_wrapper/nss_wrapper.c	2007-11-06 12:11:35 UTC (rev 25871)
@@ -535,7 +535,7 @@
 }
 
 static int nwrap_pw_copy_r(const struct passwd *src, struct passwd *dst,
-			   char *buf, size_t buflen, struct passwd **destp)
+			   char *buf, size_t buflen, struct passwd **dstp)
 {
 	char *first;
 	char *last;
@@ -567,6 +567,10 @@
 	ofs = PTR_DIFF(src->pw_shell, first);
 	dst->pw_shell = buf + ofs;
 
+	if (dstp) {
+		*dstp = dst;
+	}
+
 	return 0;
 }
 
@@ -719,7 +723,7 @@
 }
 
 static int nwrap_gr_copy_r(const struct group *src, struct group *dst,
-			   char *buf, size_t buflen, struct group **destp)
+			   char *buf, size_t buflen, struct group **dstp)
 {
 	char *first;
 	char **lastm;
@@ -759,6 +763,10 @@
 		dst->gr_mem[i] = buf + ofs;
 	}
 
+	if (dstp) {
+		*dstp = dst;
+	}
+
 	return 0;
 }