summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2007-08-28 12:49:46 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:30:16 -0500
commitc790f6437f465d9dda3dd48dca549c76d5d2fdb8 (patch)
tree710b12970ce30380b1d688b4bb126eac82d7c23c /source3
parent2af963792566797ac9edcfb528198b82a2518a18 (diff)
downloadsamba-c790f6437f465d9dda3dd48dca549c76d5d2fdb8.tar.gz
samba-c790f6437f465d9dda3dd48dca549c76d5d2fdb8.tar.bz2
samba-c790f6437f465d9dda3dd48dca549c76d5d2fdb8.zip
r24734: Move nss_err_str() to a more public place.
Guenther (This used to be commit f62292c5a1bcae2bfa10632014c5ac06dd1f50bb)
Diffstat (limited to 'source3')
-rw-r--r--source3/nsswitch/wb_common.c20
-rw-r--r--source3/nsswitch/winbind_client.h1
-rw-r--r--source3/nsswitch/winbind_nss_linux.c19
3 files changed, 21 insertions, 19 deletions
diff --git a/source3/nsswitch/wb_common.c b/source3/nsswitch/wb_common.c
index 5072b81515..d717e9db7f 100644
--- a/source3/nsswitch/wb_common.c
+++ b/source3/nsswitch/wb_common.c
@@ -673,3 +673,23 @@ BOOL winbind_on( void )
return putenv(s) != -1;
}
+/*************************************************************************
+ ************************************************************************/
+
+const char *nss_err_str(NSS_STATUS ret)
+{
+ switch (ret) {
+ case NSS_STATUS_TRYAGAIN:
+ return "NSS_STATUS_TRYAGAIN";
+ case NSS_STATUS_SUCCESS:
+ return "NSS_STATUS_SUCCESS";
+ case NSS_STATUS_NOTFOUND:
+ return "NSS_STATUS_NOTFOUND";
+ case NSS_STATUS_UNAVAIL:
+ return "NSS_STATUS_UNAVAIL";
+ case NSS_STATUS_RETURN:
+ return "NSS_STATUS_RETURN";
+ default:
+ return "UNKNOWN RETURN CODE!!!!!!!";
+ }
+}
diff --git a/source3/nsswitch/winbind_client.h b/source3/nsswitch/winbind_client.h
index d80aff37fa..423fa30056 100644
--- a/source3/nsswitch/winbind_client.h
+++ b/source3/nsswitch/winbind_client.h
@@ -15,4 +15,5 @@ int write_sock(void *buffer, int count, int recursing, int need_priv);
int read_reply(struct winbindd_response *response);
void close_sock(void);
void free_response(struct winbindd_response *response);
+const char *nss_err_str(NSS_STATUS ret);
diff --git a/source3/nsswitch/winbind_nss_linux.c b/source3/nsswitch/winbind_nss_linux.c
index 84f8c3eade..b732d96fd1 100644
--- a/source3/nsswitch/winbind_nss_linux.c
+++ b/source3/nsswitch/winbind_nss_linux.c
@@ -67,25 +67,6 @@ NSS_STATUS _nss_winbind_gidtosid(gid_t gid, char **sid, char *buffer,
extern int winbindd_fd;
-#ifdef DEBUG_NSS
-static const char *nss_err_str(NSS_STATUS ret) {
- switch (ret) {
- case NSS_STATUS_TRYAGAIN:
- return "NSS_STATUS_TRYAGAIN";
- case NSS_STATUS_SUCCESS:
- return "NSS_STATUS_SUCCESS";
- case NSS_STATUS_NOTFOUND:
- return "NSS_STATUS_NOTFOUND";
- case NSS_STATUS_UNAVAIL:
- return "NSS_STATUS_UNAVAIL";
- case NSS_STATUS_RETURN:
- return "NSS_STATUS_RETURN";
- default:
- return "UNKNOWN RETURN CODE!!!!!!!";
- }
-}
-#endif
-
/* 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. */