summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-04-20 22:13:40 +0200
committerMichael Adam <obnox@samba.org>2008-04-20 22:29:36 +0200
commitd7da0f57fa4564647637e025fd2f4c7ebd2e7293 (patch)
tree679434fb0b54e02c8fb2a5ed13e503765a9a94fe
parent166efed281599ba331c379e474120ce5b46271f0 (diff)
downloadsamba-d7da0f57fa4564647637e025fd2f4c7ebd2e7293.tar.gz
samba-d7da0f57fa4564647637e025fd2f4c7ebd2e7293.tar.bz2
samba-d7da0f57fa4564647637e025fd2f4c7ebd2e7293.zip
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 (This used to be commit 13cfa7f48a541a934a129fab0544cbf66029c4c7)
-rw-r--r--source3/nsswitch/libwbclient/wbc_util.c4
-rw-r--r--source3/nsswitch/libwbclient/wbclient.h2
-rw-r--r--source3/nsswitch/wbinfo.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/source3/nsswitch/libwbclient/wbc_util.c b/source3/nsswitch/libwbclient/wbc_util.c
index d7af4d1bf2..69cad380da 100644
--- a/source3/nsswitch/libwbclient/wbc_util.c
+++ b/source3/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);
diff --git a/source3/nsswitch/libwbclient/wbclient.h b/source3/nsswitch/libwbclient/wbclient.h
index 05cee9ab2b..a444c91da4 100644
--- a/source3/nsswitch/libwbclient/wbclient.h
+++ b/source3/nsswitch/libwbclient/wbclient.h
@@ -425,7 +425,7 @@ wbcErr wbcAuthenticateUserEx(const struct wbcAuthUserParams *params,
/*
* Resolve functions
*/
-wbcErr wbcResolveWinsByName(const char *name, const char **ip);
+wbcErr wbcResolveWinsByName(const char *name, char **ip);
wbcErr wbcResolveWinsByIP(const char *ip, const char **name);
/*
diff --git a/source3/nsswitch/wbinfo.c b/source3/nsswitch/wbinfo.c
index ed49be7431..00d772a74c 100644
--- a/source3/nsswitch/wbinfo.c
+++ b/source3/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)) {