diff options
Diffstat (limited to 'source4/nsswitch')
-rwxr-xr-x | source4/nsswitch/tests/test_wbinfo.sh | 6 | ||||
-rw-r--r-- | source4/nsswitch/winbind_nss_config.h | 2 | ||||
-rw-r--r-- | source4/nsswitch/winbind_nss_netbsd.h | 40 |
3 files changed, 44 insertions, 4 deletions
diff --git a/source4/nsswitch/tests/test_wbinfo.sh b/source4/nsswitch/tests/test_wbinfo.sh index dfd633b656..a67fac9394 100755 --- a/source4/nsswitch/tests/test_wbinfo.sh +++ b/source4/nsswitch/tests/test_wbinfo.sh @@ -62,7 +62,7 @@ admin_sid=`$wbinfo -n "$DOMAIN/$USERNAME" | cut -d " " -f1` echo "$DOMAIN/$USERNAME resolved to $admin_sid" testit "wbinfo -s $admin_sid against $TARGET" $wbinfo -s $admin_sid || failed=`expr $failed + 1` -admin_name=`wbinfo -s $admin_sid | cut -d " " -f1| tr a-z A-Z` +admin_name=`$wbinfo -s $admin_sid | cut -d " " -f1| tr a-z A-Z` echo "$admin_sid resolved to $admin_name" tested_name=`echo $DOMAIN/$USERNAME | tr a-z A-Z` @@ -100,7 +100,7 @@ else echo "success: wbinfo -U check for sane mapping" fi -admin_uid=`wbinfo -U $admin_sid` +admin_uid=`$wbinfo -U $admin_sid` testit "wbinfo -G against $TARGET" $wbinfo -G 30000 || failed=`expr $failed + 1` @@ -149,7 +149,7 @@ testit "wbinfo --all-domains against $TARGET" $wbinfo --all-domains || failed=`e testit "wbinfo --own-domain against $TARGET" $wbinfo --own-domain || failed=`expr $failed + 1` echo "test: wbinfo --own-domain against $TARGET check output" -own_domain=`wbinfo --own-domain` +own_domain=`$wbinfo --own-domain` if test x$own_domain = x$DOMAIN; then echo "success: wbinfo --own-domain against $TARGET check output" else diff --git a/source4/nsswitch/winbind_nss_config.h b/source4/nsswitch/winbind_nss_config.h index e0828dc905..ba6153ec28 100644 --- a/source4/nsswitch/winbind_nss_config.h +++ b/source4/nsswitch/winbind_nss_config.h @@ -31,7 +31,7 @@ /* Include header files from data in config.h file */ #ifndef NO_CONFIG_H -#include "lib/replace/replace.h" +#include "../replace/replace.h" #endif #include "system/passwd.h" diff --git a/source4/nsswitch/winbind_nss_netbsd.h b/source4/nsswitch/winbind_nss_netbsd.h new file mode 100644 index 0000000000..dceb57c784 --- /dev/null +++ b/source4/nsswitch/winbind_nss_netbsd.h @@ -0,0 +1,40 @@ +/* + Unix SMB/CIFS implementation. + + NetBSD loadable authentication module, providing identification + routines against Samba winbind/Windows NT Domain + + Copyright (C) Luke Mewburn 2004-2005 + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 3 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. +*/ + +#ifndef _WINBIND_NSS_NETBSD_H +#define _WINBIND_NSS_NETBSD_H + +#include <nsswitch.h> + + /* dynamic nsswitch with "new" getpw* nsdispatch API available */ +#if defined(NSS_MODULE_INTERFACE_VERSION) && defined(HAVE_GETPWENT_R) + +typedef int NSS_STATUS; + +#define NSS_STATUS_SUCCESS NS_SUCCESS +#define NSS_STATUS_NOTFOUND NS_NOTFOUND +#define NSS_STATUS_UNAVAIL NS_UNAVAIL +#define NSS_STATUS_TRYAGAIN NS_TRYAGAIN + +#endif /* NSS_MODULE_INTERFACE_VERSION && HAVE_GETPWENT_R */ + +#endif /* _WINBIND_NSS_NETBSD_H */ |