[SCM] Samba Shared Repository - branch master updated - release-4-0-0alpha7-1854-g136b2a3

[Günther Deschner]

The branch, master has been updated
       via  136b2a3eb21eda28e7a18547751ee20f097e7492 (commit)
       via  37e4c92b383397a2c77db7e5d8adf2fa4a24d398 (commit)
      from  0dbecbbee5018108131869b13db649a058f4359d (commit)

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


- Log -----------------------------------------------------------------
commit 136b2a3eb21eda28e7a18547751ee20f097e7492
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 28 11:51:46 2009 +0200

    nss_wrapper: fix nss_wrapper build for solaris.
    
    Guenther

commit 37e4c92b383397a2c77db7e5d8adf2fa4a24d398
Author: Günther Deschner <gd at samba.org>
Date:   Thu May 28 10:53:53 2009 +0200

    nss_wrapper: remove re-structuring leftovers (unused variables).
    
    Guenther

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

Summary of changes:
 lib/nss_wrapper/nss_wrapper.c |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/nss_wrapper/nss_wrapper.c b/lib/nss_wrapper/nss_wrapper.c
index 09603b8..1875dc3 100644
--- a/lib/nss_wrapper/nss_wrapper.c
+++ b/lib/nss_wrapper/nss_wrapper.c
@@ -855,8 +855,6 @@ static struct passwd *nwrap_files_getpwuid(uid_t uid)
 
 _PUBLIC_ struct passwd *nwrap_getpwuid(uid_t uid)
 {
-	int i;
-
 	if (!nwrap_enabled()) {
 		return real_getpwuid(uid);
 	}
@@ -956,6 +954,7 @@ _PUBLIC_ int nwrap_getpwent_r(struct passwd *pwdst, char *buf,
 {
 	if (!nwrap_enabled()) {
 #ifdef SOLARIS_GETPWENT_R
+		struct passwd *pw;
 		pw = real_getpwent_r(pwdst, buf, buflen);
 		if (!pw) {
 			if (errno == 0) {
@@ -1057,8 +1056,6 @@ static int nwrap_files_getgrnam_r(const char *name, struct group *grdst,
 _PUBLIC_ int nwrap_getgrnam_r(const char *name, struct group *grdst,
 			      char *buf, size_t buflen, struct group **grdstp)
 {
-	struct group *gr;
-
 	if (!nwrap_enabled()) {
 		return real_getgrnam_r(name, grdst, buf, buflen, grdstp);
 	}
@@ -1091,8 +1088,6 @@ static struct group *nwrap_files_getgrgid(gid_t gid)
 
 _PUBLIC_ struct group *nwrap_getgrgid(gid_t gid)
 {
-	int i;
-
 	if (!nwrap_enabled()) {
 		return real_getgrgid(gid);
 	}
@@ -1194,6 +1189,7 @@ _PUBLIC_ int nwrap_getgrent_r(struct group *grdst, char *buf,
 {
 	if (!nwrap_enabled()) {
 #ifdef SOLARIS_GETGRENT_R
+		struct group *gr;
 		gr = real_getgrent_r(grdst, buf, buflen);
 		if (!gr) {
 			if (errno == 0) {


-- 
Samba Shared Repository