[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1018-g338baf9

[Günther Deschner]

The branch, v3-2-test has been updated
       via  338baf96cb957fa52e312d42fbf0fa227d7dafda (commit)
      from  25f571f40a630bff5a47bba6b01e42d4e0ffed66 (commit)

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


- Log -----------------------------------------------------------------
commit 338baf96cb957fa52e312d42fbf0fa227d7dafda
Author: Günther Deschner <gd at samba.org>
Date:   Thu Jan 3 12:10:27 2008 +0100

    Some coding convention pedantism.
    
    Guenther

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

Summary of changes:
 source/nsswitch/libwbclient/wbc_pam.c  |    4 ++--
 source/nsswitch/libwbclient/wbc_pwd.c  |    6 +++---
 source/nsswitch/libwbclient/wbc_sid.c  |   10 +++++-----
 source/nsswitch/libwbclient/wbc_util.c |   12 ++++++------
 source/nsswitch/libwbclient/wbclient.h |    2 +-
 5 files changed, 17 insertions(+), 17 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/libwbclient/wbc_pam.c b/source/nsswitch/libwbclient/wbc_pam.c
index 1548c33..7f7c7b8 100644
--- a/source/nsswitch/libwbclient/wbc_pam.c
+++ b/source/nsswitch/libwbclient/wbc_pam.c
@@ -31,7 +31,7 @@
  * @return #wbcErr
  **/
 
-wbcErr wbcAuthenticateUser(const char *username, 
+wbcErr wbcAuthenticateUser(const char *username,
 			   const char *password)
 {
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
@@ -61,5 +61,5 @@ wbcErr wbcAuthenticateUser(const char *username,
 	BAIL_ON_WBC_ERROR(wbc_status);
 
 done:
-	return wbc_status;	
+	return wbc_status;
 }
diff --git a/source/nsswitch/libwbclient/wbc_pwd.c b/source/nsswitch/libwbclient/wbc_pwd.c
index 5f7437b..b24e198 100644
--- a/source/nsswitch/libwbclient/wbc_pwd.c
+++ b/source/nsswitch/libwbclient/wbc_pwd.c
@@ -228,14 +228,14 @@ wbcErr wbcGetgrnam(const char *name, struct group **grp)
 					&response);
 	BAIL_ON_WBC_ERROR(wbc_status);
 
-	*grp = copy_group_entry(&response.data.gr, 
+	*grp = copy_group_entry(&response.data.gr,
 				(char*)response.extra_data.data);
 	BAIL_ON_PTR_ERROR(*grp, wbc_status);
 
  done:
 	if (response.extra_data.data)
 		free(response.extra_data.data);
-	
+
 	return wbc_status;
 }
 
@@ -271,7 +271,7 @@ wbcErr wbcGetgrgid(gid_t gid, struct group **grp)
 					&response);
 	BAIL_ON_WBC_ERROR(wbc_status);
 
-	*grp = copy_group_entry(&response.data.gr, 
+	*grp = copy_group_entry(&response.data.gr,
 				(char*)response.extra_data.data);
 	BAIL_ON_PTR_ERROR(*grp, wbc_status);
 
diff --git a/source/nsswitch/libwbclient/wbc_sid.c b/source/nsswitch/libwbclient/wbc_sid.c
index 8311a21..abe1457 100644
--- a/source/nsswitch/libwbclient/wbc_sid.c
+++ b/source/nsswitch/libwbclient/wbc_sid.c
@@ -392,7 +392,7 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
 		*q = '\0';
 
 		(*names)[i] = talloc_strdup((*names), p);
-		BAIL_ON_PTR_ERROR(((*names)[i]), wbc_status);		
+		BAIL_ON_PTR_ERROR(((*names)[i]), wbc_status);
 
 		p = q+1;
 	}
@@ -405,10 +405,10 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
 	wbc_status = WBC_ERR_SUCCESS;
 
  done:
-	if (response.extra_data.data) {		
+	if (response.extra_data.data) {
 		free(response.extra_data.data);
-	}	
-		
+	}
+
 	if (!WBC_ERROR_IS_OK(wbc_status)) {
 		if (domain_name)
 			talloc_free(domain_name);
@@ -421,4 +421,4 @@ wbcErr wbcLookupRids(struct wbcDomainSid *dom_sid,
 	}
 
 	return wbc_status;
-} 
+}
diff --git a/source/nsswitch/libwbclient/wbc_util.c b/source/nsswitch/libwbclient/wbc_util.c
index 7eb1973..ff3cec8 100644
--- a/source/nsswitch/libwbclient/wbc_util.c
+++ b/source/nsswitch/libwbclient/wbc_util.c
@@ -60,7 +60,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
 	struct winbindd_response response;
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
 	struct wbcDomainInfo *info = NULL;
-	
+
 	if (!domain || !dinfo) {
 		wbc_status = WBC_ERR_INVALID_PARAM;
 		BAIL_ON_WBC_ERROR(wbc_status);
@@ -71,7 +71,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
 	ZERO_STRUCT(request);
 	ZERO_STRUCT(response);
 
-	strncpy(request.domain_name, domain, 
+	strncpy(request.domain_name, domain,
 		sizeof(request.domain_name)-1);
 
 	wbc_status = wbcRequestResponse(WINBINDD_DOMAIN_INFO,
@@ -82,15 +82,15 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
 	info = talloc(NULL, struct wbcDomainInfo);
 	BAIL_ON_PTR_ERROR(info, wbc_status);
 
-	info->short_name = talloc_strdup(info, 
+	info->short_name = talloc_strdup(info,
 					 response.data.domain_info.name);
 	BAIL_ON_PTR_ERROR(info->short_name, wbc_status);
 
-	info->dns_name = talloc_strdup(info, 
+	info->dns_name = talloc_strdup(info,
 				       response.data.domain_info.alt_name);
 	BAIL_ON_PTR_ERROR(info->dns_name, wbc_status);
 
-	wbc_status = wbcStringToSid(response.data.domain_info.sid, 
+	wbc_status = wbcStringToSid(response.data.domain_info.sid,
 				    &info->sid);
 	BAIL_ON_WBC_ERROR(wbc_status);
 
@@ -102,7 +102,7 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
 		info->flags |= WBC_DOMINFO_PRIMARY;
 
 	*dinfo = info;
-	
+
 	wbc_status = WBC_ERR_SUCCESS;
 
  done:
diff --git a/source/nsswitch/libwbclient/wbclient.h b/source/nsswitch/libwbclient/wbclient.h
index 2867aad..6b85d7e 100644
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/nsswitch/libwbclient/wbclient.h
@@ -177,7 +177,7 @@ wbcErr wbcDomainSequenceNumbers(void);
  * Athenticate functions
  */
 
-wbcErr wbcAuthenticateUser(const char *username, 
+wbcErr wbcAuthenticateUser(const char *username,
 			   const char *password);
 
 


-- 
Samba Shared Repository