[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-659-gc274fe7

[Volker Lendecke]

The branch, v3-2-test has been updated
       via  c274fe7d21badb42ca8d4d1115ae6bffdb19485f (commit)
       via  18bf2b2028e64403a79b7cc06d3185a3e526d97d (commit)
      from  3130fb7b32285b8501f5ee8cbc62b478c09cccd3 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit c274fe7d21badb42ca8d4d1115ae6bffdb19485f
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 6 12:26:15 2008 +0200

    Fix a C++ warning

commit 18bf2b2028e64403a79b7cc06d3185a3e526d97d
Author: Volker Lendecke <vl at samba.org>
Date:   Sun Apr 6 12:26:01 2008 +0200

    Remove external refs to winbindd_fd

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

Summary of changes:
 source/nsswitch/winbind_nss_linux.c |    4 +---
 source/utils/ntlm_auth.c            |    2 --
 2 files changed, 1 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/winbind_nss_linux.c b/source/nsswitch/winbind_nss_linux.c
index bfac2ec..c11c187 100644
--- a/source/nsswitch/winbind_nss_linux.c
+++ b/source/nsswitch/winbind_nss_linux.c
@@ -73,8 +73,6 @@ NSS_STATUS _nss_winbind_gidtosid(gid_t gid, char **sid, char *buffer,
 
 /* Prototypes from wb_common.c */
 
-extern int winbindd_fd;
-
 /* Allocate some space from the nss static buffer.  The buffer and buflen
    are the pointers passed in by the C library to the _nss_ntdom_*
    functions. */
@@ -149,7 +147,7 @@ static bool next_token_alloc(const char **ptr,
 	}
 
 	/* We started with len = 1 so we have space for the nul. */
-	*pp_buff = malloc(len);
+	*pp_buff = (char *)malloc(len);
 	if (!*pp_buff) {
 		return false;
 	}
diff --git a/source/utils/ntlm_auth.c b/source/utils/ntlm_auth.c
index e313d62..4586086 100644
--- a/source/utils/ntlm_auth.c
+++ b/source/utils/ntlm_auth.c
@@ -111,8 +111,6 @@ static const struct {
 	{ NUM_HELPER_MODES, NULL, NULL}
 };
 
-extern int winbindd_fd;
-
 const char *opt_username;
 const char *opt_domain;
 const char *opt_workstation;


-- 
Samba Shared Repository