[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via c7073f8 s3-vfs: rename open function to open_fn.
from 0b89ce6 s3-build: move MAP_FILE define to the only place used.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit c7073f8b545976719bfdba7b7bbd460d595041d5
Author: Günther Deschner
Date: Wed Apr 20 22:55:25 2011 +0200
s3-vfs: rename open function to open_fn.
This should finally fix the AIX build and allow to remove AIX specific
ifdefs.
Guenther
Signed-off-by: Jeremy Allison
Autobuild-User: Jeremy Allison
Autobuild-Date: Thu Apr 21 02:01:20 CEST 2011 on sn-devel-104
---
Summary of changes:
examples/VFS/skel_opaque.c |2 +-
examples/VFS/skel_transparent.c|2 +-
source3/include/vfs.h |7 ---
source3/modules/vfs_acl_tdb.c |2 +-
source3/modules/vfs_acl_xattr.c|2 +-
source3/modules/vfs_audit.c|2 +-
source3/modules/vfs_cap.c |2 +-
source3/modules/vfs_catia.c|2 +-
source3/modules/vfs_commit.c |2 +-
source3/modules/vfs_default.c |6 +-
source3/modules/vfs_extd_audit.c |2 +-
source3/modules/vfs_full_audit.c |2 +-
source3/modules/vfs_onefs.c|2 +-
source3/modules/vfs_onefs_shadow_copy.c|2 +-
source3/modules/vfs_prealloc.c |2 +-
source3/modules/vfs_preopen.c |2 +-
source3/modules/vfs_scannedonly.c |2 +-
source3/modules/vfs_shadow_copy2.c |2 +-
source3/modules/vfs_smb_traffic_analyzer.c |2 +-
source3/modules/vfs_streams_depot.c|2 +-
source3/modules/vfs_streams_xattr.c|2 +-
source3/modules/vfs_syncops.c |2 +-
source3/modules/vfs_time_audit.c |2 +-
source3/smbd/vfs.c |7 ++-
24 files changed, 28 insertions(+), 34 deletions(-)
Changeset truncated at 500 lines:
diff --git a/examples/VFS/skel_opaque.c b/examples/VFS/skel_opaque.c
index ef7c3af..f60f0fe 100644
--- a/examples/VFS/skel_opaque.c
+++ b/examples/VFS/skel_opaque.c
@@ -801,7 +801,7 @@ struct vfs_fn_pointers skel_transparent_fns = {
/* File operations */
- .open = skel_open,
+ .open_fn = skel_open,
.create_file = skel_create_file,
.close_fn = skel_close_fn,
.vfs_read = skel_vfs_read,
diff --git a/examples/VFS/skel_transparent.c b/examples/VFS/skel_transparent.c
index 403e28d..f06e02a 100644
--- a/examples/VFS/skel_transparent.c
+++ b/examples/VFS/skel_transparent.c
@@ -745,7 +745,7 @@ struct vfs_fn_pointers skel_transparent_fns = {
/* File operations */
- .open = skel_open,
+ .open_fn = skel_open,
.create_file = skel_create_file,
.close_fn = skel_close_fn,
.vfs_read = skel_vfs_read,
diff --git a/source3/include/vfs.h b/source3/include/vfs.h
index ad15bd8..28d6c38 100644
--- a/source3/include/vfs.h
+++ b/source3/include/vfs.h
@@ -133,6 +133,7 @@
/* Leave at 28 - not yet released. Rename posix_fallocate to fallocate
to split out the two possible uses. JRA. */
/* Leave at 28 - not yet released. Add fdopendir. JRA. */
+/* Leave at 28 - not yet released. Rename open function to open_fn. - gd */
#define SMB_VFS_INTERFACE_VERSION 28
@@ -214,9 +215,9 @@ struct vfs_fn_pointers {
/* File operations */
- int (*open)(struct vfs_handle_struct *handle,
- struct smb_filename *smb_fname, files_struct *fsp,
- int flags, mode_t mode);
+ int (*open_fn)(struct vfs_handle_struct *handle,
+ struct smb_filename *smb_fname, files_struct *fsp,
+ int flags, mode_t mode);
NTSTATUS (*create_file)(struct vfs_handle_struct *handle,
struct smb_request *req,
uint16_t root_dir_fid,
diff --git a/source3/modules/vfs_acl_tdb.c b/source3/modules/vfs_acl_tdb.c
index 17cf493..f2e0415 100644
--- a/source3/modules/vfs_acl_tdb.c
+++ b/source3/modules/vfs_acl_tdb.c
@@ -402,7 +402,7 @@ static struct vfs_fn_pointers vfs_acl_tdb_fns = {
.opendir = opendir_acl_common,
.mkdir = mkdir_acl_common,
.rmdir = rmdir_acl_tdb,
- .open = open_acl_common,
+ .open_fn = open_acl_common,
.create_file = create_file_acl_common,
.unlink = unlink_acl_tdb,
.chmod = chmod_acl_module_common,
diff --git a/source3/modules/vfs_acl_xattr.c b/source3/modules/vfs_acl_xattr.c
index 90959f3..2a83430 100644
--- a/source3/modules/vfs_acl_xattr.c
+++ b/source3/modules/vfs_acl_xattr.c
@@ -206,7 +206,7 @@ static struct vfs_fn_pointers vfs_acl_xattr_fns = {
.opendi
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated via b5e5510 WHATSNEW: Update changes since 3.4.12. from fd387cd s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD (cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686) http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log - commit b5e5510ea62af1df31b5f06c5cf1029217b648e1 Author: Karolin Seeger Date: Wed Apr 20 20:51:26 2011 +0200 WHATSNEW: Update changes since 3.4.12. Karolin --- Summary of changes: WHATSNEW.txt |4 1 files changed, 4 insertions(+), 0 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index b7d9306..d8900c4 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -24,6 +24,10 @@ o Volker Lendecke * BUG 8086: Fix Winbind crash caused by null pointer reference. +o Sergey Korsak +* BUG 8099: setpwent() actually does endpwent() on FreeBSD. + + ## Reporting bugs & Development Discussion ### -- Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 80078cb Fix is_myname_or_ipaddr() to be robust against strange DNS
setups.
from 2167ac2 s3: Fix bug 8099 - setpwent() actually does endpwent() on
FreeBSD
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 80078cb6ef2e6976cb5ab25a86157bca22c836a2
Author: Jeremy Allison
Date: Thu Mar 24 11:55:38 2011 -0700
Fix is_myname_or_ipaddr() to be robust against strange DNS setups.
If IPv6 DNS names are turned on, but Samba isn't configured to
listen on an IPv6 interface, then is_myname_or_ipaddr() can return
false on a valid DNS name that it should detect is our own. If the
IPv6 addr is returned by preference, then looking at the first addr
only causes is_myname_or_ipaddr() to fail. We need to look at all the
addresses returned by the DNS lookup and check all of them against
our interface list. This is an order N^2 lookup, but there shouldn't
be enough addresses to make this a practical problem.
Jeremy.
Fix bug #8038 - Connecting to a printer can return INVALID_PARAMETER when
IPv6
DNS names are turned on.
---
Summary of changes:
source3/lib/util_sock.c | 88 ++
1 files changed, 57 insertions(+), 31 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/lib/util_sock.c b/source3/lib/util_sock.c
index 7a573ad..1441560 100644
--- a/source3/lib/util_sock.c
+++ b/source3/lib/util_sock.c
@@ -1839,13 +1839,46 @@ const char *get_mydnsfullname(void)
}
/
+ Is this my ip address ?
+/
+
+static bool is_my_ipaddr(const char *ipaddr_str)
+{
+ struct sockaddr_storage ss;
+ struct iface_struct *nics;
+ int i, n;
+
+ if (!interpret_string_addr(&ss, ipaddr_str, AI_NUMERICHOST)) {
+ return false;
+ }
+
+ if (ismyaddr((struct sockaddr *)&ss)) {
+ return true;
+ }
+
+ if (is_zero_addr((struct sockaddr *)&ss) ||
+ is_loopback_addr((struct sockaddr *)&ss)) {
+ return false;
+ }
+
+ n = get_interfaces(talloc_tos(), &nics);
+ for (i=0; iai_next) {
+ char addr[INET6_ADDRSTRLEN];
+ struct sockaddr_storage ss;
- n = get_interfaces(talloc_tos(), &nics);
- for (i=0; iai_addr, p->ai_addrlen);
+ print_sockaddr(addr,
+ sizeof(addr),
+ &ss);
+ if (is_my_ipaddr(addr)) {
+ freeaddrinfo(res);
return true;
}
}
- TALLOC_FREE(nics);
+ freeaddrinfo(res);
+ }
+
+ /* Maybe its an IP address? */
+ if (is_ipaddress(servername)) {
+ return is_my_ipaddr(servername);
}
/* No match */
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-6-test updated
The branch, v3-6-test has been updated
via 3d14ed9 s3-spoolss: fix debug statement in
spoolss_addprinterex_level_2().
via 317b5d8 s3-smbd: fix the AIX 5.3 build.
from 9953e69 tdb_backup: avoid transaction on backup file, use lockall
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-6-test
- Log -
commit 3d14ed92bb698a5f0f33c10f65cc840b330bb65c
Author: Günther Deschner
Date: Wed Apr 20 17:19:15 2011 +0200
s3-spoolss: fix debug statement in spoolss_addprinterex_level_2().
Guenther
(cherry picked from commit 0cf9b47725b50fd916a7ca56ca3f7e9c9263411a)
commit 317b5d8fad7320f186c71b64d4d0470be634c71d
Author: Günther Deschner
Date: Wed Apr 20 17:54:24 2011 +0200
s3-smbd: fix the AIX 5.3 build.
(AIX defines open to be open64)
Guenther
(cherry picked from commit ae61a5c3d05192457f5a0b24dd9bd34317df566f)
---
Summary of changes:
source3/modules/vfs_aixacl_util.c |1 +
source3/modules/vfs_default.c |4
source3/printing/print_aix.c|1 +
source3/rpc_server/spoolss/srv_spoolss_nt.c |4 ++--
source3/smbd/vfs.c |3 +++
5 files changed, 11 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/modules/vfs_aixacl_util.c
b/source3/modules/vfs_aixacl_util.c
index 768d0f3..d867f9d 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "smbd/smbd.h"
SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 859b212..4e993e1 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1649,6 +1649,10 @@ static int vfswrap_set_offline(struct vfs_handle_struct
*handle,
return -1;
}
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
+
static struct vfs_fn_pointers vfs_default_fns = {
/* Disk operations */
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 1b23610..b7198d3 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,6 +25,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "printing/pcap.h"
#ifdef AIX
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 4a78aa4..312f509 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -7857,8 +7857,8 @@ static WERROR spoolss_addprinterex_level_2(struct
pipes_struct *p,
return WERR_ACCESS_DENIED;
}
} else {
- DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no"
- "smb.conf parameter \"addprinter command\" is defined.
This"
+ DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no "
+ "smb.conf parameter \"addprinter command\" is defined.
This "
"parameter must exist for this call to succeed\n",
info2->sharename ));
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 0438f79..aaa713e 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.c
@@ -1273,6 +1273,9 @@ int smb_vfs_call_open(struct vfs_handle_struct *handle,
struct smb_filename *smb_fname, struct files_struct *fsp,
int flags, mode_t mode)
{
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
VFS_FIND(open);
return handle->fns->open(handle, smb_fname, fsp, flags, mode);
}
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch master updated
The branch, master has been updated
via 0b89ce6 s3-build: move MAP_FILE define to the only place used.
via ae61a5c s3-smbd: fix the AIX 5.3 build.
via c8f9515 s4-smbtorture: restructure documentname handling in spoolss
test a bit.
via 0cf9b47 s3-spoolss: fix debug statement in
spoolss_addprinterex_level_2().
from 6f846dd lib/util/charset Always set *converted_size even on failure
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -
commit 0b89ce671250daddc86400ef4e1996c37c126025
Author: Günther Deschner
Date: Wed Apr 20 18:21:25 2011 +0200
s3-build: move MAP_FILE define to the only place used.
Guenther
Autobuild-User: Günther Deschner
Autobuild-Date: Wed Apr 20 19:16:47 CEST 2011 on sn-devel-104
commit ae61a5c3d05192457f5a0b24dd9bd34317df566f
Author: Günther Deschner
Date: Wed Apr 20 17:54:24 2011 +0200
s3-smbd: fix the AIX 5.3 build.
(AIX defines open to be open64)
Guenther
commit c8f9515f193e634da2ef01c525e2a05a3d519862
Author: Günther Deschner
Date: Wed Apr 20 17:53:43 2011 +0200
s4-smbtorture: restructure documentname handling in spoolss test a bit.
Guenther
commit 0cf9b47725b50fd916a7ca56ca3f7e9c9263411a
Author: Günther Deschner
Date: Wed Apr 20 17:19:15 2011 +0200
s3-spoolss: fix debug statement in spoolss_addprinterex_level_2().
Guenther
---
Summary of changes:
source3/include/includes.h |4
source3/modules/vfs_aio_fork.c |4
source3/modules/vfs_aixacl_util.c |1 +
source3/modules/vfs_default.c |4
source3/printing/print_aix.c|1 +
source3/rpc_server/spoolss/srv_spoolss_nt.c |4 ++--
source3/smbd/vfs.c |3 +++
source4/torture/rpc/spoolss.c |7 ---
8 files changed, 19 insertions(+), 9 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 1dac73a..a76942f 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -580,10 +580,6 @@ enum flush_reason_enum {
#define SIGRTMIN NSIG
#endif
-#ifndef MAP_FILE
-#define MAP_FILE 0
-#endif
-
#if defined(HAVE_PUTPRPWNAM) && defined(AUTH_CLEARTEXT_SEG_CHARS)
#define OSF1_ENH_SEC 1
#endif
diff --git a/source3/modules/vfs_aio_fork.c b/source3/modules/vfs_aio_fork.c
index 881bc51..41b5a89 100644
--- a/source3/modules/vfs_aio_fork.c
+++ b/source3/modules/vfs_aio_fork.c
@@ -24,6 +24,10 @@
#include "system/shmem.h"
#include "smbd/smbd.h"
+#ifndef MAP_FILE
+#define MAP_FILE 0
+#endif
+
struct mmap_area {
size_t size;
volatile void *ptr;
diff --git a/source3/modules/vfs_aixacl_util.c
b/source3/modules/vfs_aixacl_util.c
index 768d0f3..d867f9d 100644
--- a/source3/modules/vfs_aixacl_util.c
+++ b/source3/modules/vfs_aixacl_util.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "smbd/smbd.h"
SMB_ACL_T aixacl_to_smbacl(struct acl *file_acl)
diff --git a/source3/modules/vfs_default.c b/source3/modules/vfs_default.c
index 859b212..4e993e1 100644
--- a/source3/modules/vfs_default.c
+++ b/source3/modules/vfs_default.c
@@ -1649,6 +1649,10 @@ static int vfswrap_set_offline(struct vfs_handle_struct
*handle,
return -1;
}
+#ifdef AIX
+#undef open /* AIX defines open to be open64 */
+#endif
+
static struct vfs_fn_pointers vfs_default_fns = {
/* Disk operations */
diff --git a/source3/printing/print_aix.c b/source3/printing/print_aix.c
index 1b23610..b7198d3 100644
--- a/source3/printing/print_aix.c
+++ b/source3/printing/print_aix.c
@@ -25,6 +25,7 @@
*/
#include "includes.h"
+#include "system/filesys.h"
#include "printing/pcap.h"
#ifdef AIX
diff --git a/source3/rpc_server/spoolss/srv_spoolss_nt.c
b/source3/rpc_server/spoolss/srv_spoolss_nt.c
index 4a78aa4..312f509 100644
--- a/source3/rpc_server/spoolss/srv_spoolss_nt.c
+++ b/source3/rpc_server/spoolss/srv_spoolss_nt.c
@@ -7857,8 +7857,8 @@ static WERROR spoolss_addprinterex_level_2(struct
pipes_struct *p,
return WERR_ACCESS_DENIED;
}
} else {
- DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no"
- "smb.conf parameter \"addprinter command\" is defined.
This"
+ DEBUG(0,("spoolss_addprinterex_level_2: add printer for printer
%s called and no "
+ "smb.conf parameter \"addprinter command\" is defined.
This "
"parameter must exist for this call to succeed\n",
info2->sharename ));
}
diff --git a/source3/smbd/vfs.c b/source3/smbd/vfs.c
index 0438f79..aaa713e 100644
--- a/source3/smbd/vfs.c
+++ b/source3/smbd/vfs.
[SCM] Samba Shared Repository - branch v3-4-test updated
The branch, v3-4-test has been updated
via fd387cd s3: Fix bug 8099 - setpwent() actually does endpwent() on
FreeBSD (cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686)
from 0517118 WHATSNEW: Prepare 3.4.13 release notes.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test
- Log -
commit fd387cd0bf186a94b64e8c2085c943992629e5af
Author: Sergey Korsak
Date: Tue Apr 19 18:51:32 2011 +0200
s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD
(cherry picked from commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686)
---
Summary of changes:
nsswitch/winbind_nss_freebsd.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_nss_freebsd.c b/nsswitch/winbind_nss_freebsd.c
index ac230c8..5fcd557 100644
--- a/nsswitch/winbind_nss_freebsd.c
+++ b/nsswitch/winbind_nss_freebsd.c
@@ -58,14 +58,14 @@ static ns_mtab methods[] = {
{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r },
{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_winbind_getgrgid_r },
{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
-{ NSDB_GROUP, "endgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
-{ NSDB_GROUP, "setgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
+{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
+{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r
},
{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r
},
{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_winbind_getpwent_r
},
-{ NSDB_PASSWD, "endpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
-{ NSDB_PASSWD, "setpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
+{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
+{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
};
--
Samba Shared Repository
[SCM] Samba Shared Repository - branch v3-5-test updated
The branch, v3-5-test has been updated
via 2167ac2 s3: Fix bug 8099 - setpwent() actually does endpwent() on
FreeBSD
from 23e6f41 Fix bug 8072 - PANIC: create_file_acl_common frees handle
two times.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-5-test
- Log -
commit 2167ac2cd42c9ed5aaae0086dbd27e29d1d77686
Author: Sergey Korsak
Date: Tue Apr 19 18:51:32 2011 +0200
s3: Fix bug 8099 - setpwent() actually does endpwent() on FreeBSD
---
Summary of changes:
nsswitch/winbind_nss_freebsd.c |8
1 files changed, 4 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/nsswitch/winbind_nss_freebsd.c b/nsswitch/winbind_nss_freebsd.c
index ac230c8..5fcd557 100644
--- a/nsswitch/winbind_nss_freebsd.c
+++ b/nsswitch/winbind_nss_freebsd.c
@@ -58,14 +58,14 @@ static ns_mtab methods[] = {
{ NSDB_GROUP, "getgrnam_r", __nss_compat_getgrnam_r, _nss_winbind_getgrnam_r },
{ NSDB_GROUP, "getgrgid_r", __nss_compat_getgrgid_r, _nss_winbind_getgrgid_r },
{ NSDB_GROUP, "getgrent_r", __nss_compat_getgrent_r, _nss_winbind_getgrent_r },
-{ NSDB_GROUP, "endgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
-{ NSDB_GROUP, "setgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
+{ NSDB_GROUP, "setgrent", __nss_compat_setgrent, _nss_winbind_setgrent },
+{ NSDB_GROUP, "endgrent", __nss_compat_endgrent, _nss_winbind_endgrent },
{ NSDB_PASSWD, "getpwnam_r", __nss_compat_getpwnam_r, _nss_winbind_getpwnam_r
},
{ NSDB_PASSWD, "getpwuid_r", __nss_compat_getpwuid_r, _nss_winbind_getpwuid_r
},
{ NSDB_PASSWD, "getpwent_r", __nss_compat_getpwent_r, _nss_winbind_getpwent_r
},
-{ NSDB_PASSWD, "endpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
-{ NSDB_PASSWD, "setpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
+{ NSDB_PASSWD, "setpwent", __nss_compat_setpwent, _nss_winbind_setpwent },
+{ NSDB_PASSWD, "endpwent", __nss_compat_endpwent, _nss_winbind_endpwent },
};
--
Samba Shared Repository
