[SCM] Samba Shared Repository - branch master updated

[Stefan Metzmacher]

The branch, master has been updated
       via  b79c0e1 Revert "nsswitch Add talloc depencency for nsstest"
       via  ce113ea nsswitch: remove includes.h dependency from nsstest.c
      from  263642b dynconfig: Add extern to header, try to unbreak imini buildfarm host.

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit b79c0e1adbe8ad591157d92b36106484c2c18313
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 4 08:43:16 2011 +0100

    Revert "nsswitch Add talloc depencency for nsstest"
    
    This reverts commit 640028d158583825ea5ffd1266f099cf8776db5d.
    
    This is not needed anymore.
    
    metze
    
    Autobuild-User: Stefan Metzmacher <metze at samba.org>
    Autobuild-Date: Tue Jan  4 09:38:57 CET 2011 on sn-devel-104

commit ce113ea02980563133c547bb0693864951ce16a5
Author: Stefan Metzmacher <metze at samba.org>
Date:   Tue Jan 4 08:42:16 2011 +0100

    nsswitch: remove includes.h dependency from nsstest.c
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 nsswitch/nsstest.c     |   25 +++++++++----------------
 nsswitch/wscript_build |    2 +-
 2 files changed, 10 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/nsswitch/nsstest.c b/nsswitch/nsstest.c
index 8742b32..d84e028 100644
--- a/nsswitch/nsstest.c
+++ b/nsswitch/nsstest.c
@@ -18,16 +18,9 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
+#include "replace.h"
 #include "nsswitch/nsstest.h"
 
-#ifdef malloc
-#undef malloc
-#endif
-#ifdef realloc
-#undef realloc
-#endif
-
 static const char *so_path = "/lib/libnss_winbind.so";
 static const char *nss_name = "winbind";
 static int nss_errno;
@@ -55,10 +48,10 @@ static void *find_fn(const char *name)
 	if (!res) {
 		printf("Can't find function %s\n", s);
 		total_errors++;
-		SAFE_FREE(s);
+		free(s);
 		return NULL;
 	}
-	SAFE_FREE(s);
+	free(s);
 	return res;
 }
 
@@ -201,12 +194,12 @@ again:
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	if (status != NSS_STATUS_SUCCESS) {
 		report_nss_error("getgrent", status);
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	return &grp;
@@ -239,12 +232,12 @@ again:
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	if (status != NSS_STATUS_SUCCESS) {
 		report_nss_error("getgrnam", status);
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	return &grp;
@@ -278,12 +271,12 @@ again:
 		goto again;
 	}
 	if (status == NSS_STATUS_NOTFOUND) {
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	if (status != NSS_STATUS_SUCCESS) {
 		report_nss_error("getgrgid", status);
-		SAFE_FREE(buf);
+		free(buf);
 		return NULL;
 	}
 	return &grp;
diff --git a/nsswitch/wscript_build b/nsswitch/wscript_build
index d40e143..a9881bd 100644
--- a/nsswitch/wscript_build
+++ b/nsswitch/wscript_build
@@ -10,7 +10,7 @@ bld.SAMBA_LIBRARY('winbind-client',
 
 bld.SAMBA_BINARY('nsstest',
 	source='nsstest.c',
-	deps='replace talloc'
+	deps='replace'
 	)
 
 


-- 
Samba Shared Repository