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

[Michael Adam]

The branch, v3-2-test has been updated
       via  f81da8e8ed8e2d75c77bd8b5e7fdd7c53bab7e49 (commit)
       via  13cfa7f48a541a934a129fab0544cbf66029c4c7 (commit)
      from  0de001a5446545b928eb88e1916b4fe674017424 (commit)

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


- Log -----------------------------------------------------------------
commit f81da8e8ed8e2d75c77bd8b5e7fdd7c53bab7e49
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 20 22:17:39 2008 +0200

    libwbclient: change wbcResolveWinsByIP() to take char ** instead of const char **
    
    Fix a compile warning. This seems the right thing since the data is created
    by talloc_strdup...
    
    Michael

commit 13cfa7f48a541a934a129fab0544cbf66029c4c7
Author: Michael Adam <obnox at samba.org>
Date:   Sun Apr 20 22:13:40 2008 +0200

    libwbclient: fix wbcResolveWinsByName() to take char * instead of const char **
    
    This fixes a compile warning and seems the correct thing to me as
    the returned data is talloc_strdup't, so not const anyways.
    
    Michael

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

Summary of changes:
 source/nsswitch/libwbclient/wbc_util.c |    8 ++++----
 source/nsswitch/libwbclient/wbclient.h |    4 ++--
 source/nsswitch/wbinfo.c               |    4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/nsswitch/libwbclient/wbc_util.c b/source/nsswitch/libwbclient/wbc_util.c
index d7af4d1..a1b6626 100644
--- a/source/nsswitch/libwbclient/wbc_util.c
+++ b/source/nsswitch/libwbclient/wbc_util.c
@@ -197,12 +197,12 @@ wbcErr wbcDomainInfo(const char *domain, struct wbcDomainInfo **dinfo)
  * @return #wbcErr
  *
  **/
-wbcErr wbcResolveWinsByName(const char *name, const char **ip)
+wbcErr wbcResolveWinsByName(const char *name, char **ip)
 {
 	struct winbindd_request request;
 	struct winbindd_response response;
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-	const char *ipaddr;
+	char *ipaddr;
 
 	ZERO_STRUCT(request);
 	ZERO_STRUCT(response);
@@ -237,12 +237,12 @@ wbcErr wbcResolveWinsByName(const char *name, const char **ip)
  * @return #wbcErr
  *
  **/
-wbcErr wbcResolveWinsByIP(const char *ip, const char **name)
+wbcErr wbcResolveWinsByIP(const char *ip, char **name)
 {
 	struct winbindd_request request;
 	struct winbindd_response response;
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-	const char *name_str;
+	char *name_str;
 
 	ZERO_STRUCT(request);
 	ZERO_STRUCT(response);
diff --git a/source/nsswitch/libwbclient/wbclient.h b/source/nsswitch/libwbclient/wbclient.h
index 05cee9a..d73ea29 100644
--- a/source/nsswitch/libwbclient/wbclient.h
+++ b/source/nsswitch/libwbclient/wbclient.h
@@ -425,8 +425,8 @@ wbcErr wbcAuthenticateUserEx(const struct wbcAuthUserParams *params,
 /*
  * Resolve functions
  */
-wbcErr wbcResolveWinsByName(const char *name, const char **ip);
-wbcErr wbcResolveWinsByIP(const char *ip, const char **name);
+wbcErr wbcResolveWinsByName(const char *name, char **ip);
+wbcErr wbcResolveWinsByIP(const char *ip, char **name);
 
 /*
  * Trusted domain functions
diff --git a/source/nsswitch/wbinfo.c b/source/nsswitch/wbinfo.c
index ed49be7..8aa4e5f 100644
--- a/source/nsswitch/wbinfo.c
+++ b/source/nsswitch/wbinfo.c
@@ -300,7 +300,7 @@ static bool wbinfo_get_userdomgroups(const char *user_sid_str)
 static bool wbinfo_wins_byname(const char *name)
 {
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-	const char *ip = NULL;
+	char *ip = NULL;
 
 	wbc_status = wbcResolveWinsByName(name, &ip);
 	if (!WBC_ERROR_IS_OK(wbc_status)) {
@@ -321,7 +321,7 @@ static bool wbinfo_wins_byname(const char *name)
 static bool wbinfo_wins_byip(const char *ip)
 {
 	wbcErr wbc_status = WBC_ERR_UNKNOWN_FAILURE;
-	const char *name = NULL;
+	char *name = NULL;
 
 	wbc_status = wbcResolveWinsByIP(ip, &name);
 	if (!WBC_ERROR_IS_OK(wbc_status)) {


-- 
Samba Shared Repository