r5208: pull one last change from 3.0

svn merge -r5205:5207 $SVNURL/branches//SAMBA_3_0

** This is what will be 3.0.11-final (unless I find 
   anymore showstopper bugs between now and tomorrow 
   morning)                                           **

6 files changed, 22 insertions, 12 deletions

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 4300b91178d..0047377b001 100644
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -1,6 +1,6 @@
 		   ==============================
                    Release Notes for Samba 3.0.11
-                             XXX XX, 2005
+                             Feb 5, 2005
                    ==============================
 
 This is the latest stable release of Samba. This is the version
@@ -72,6 +72,7 @@ commits
 o   Timur Bakeyev <timur@com.bat.ru>
     * BUG 2263: Guard base64_encode_data_blob() against empty blobs.
 
+
 o   Gerald (Jerry) Carter <jerry@samba.org>
     * BUG 2262: Add support in configure.in for *freebsd6*.
     * BUG 2266: Portability fixes for queota code on FreeBSD4.
@@ -98,6 +99,10 @@ o   Levente Farkas <lfarkas@lfarkas.org>
       packages.
 
 
+o   Jay Fenlason <fenlason@redhat.com>
+    * Several patches from RedHat's Fedora Core RPMS.
+
+
 o   Deryck Hodge <deryck@samba.org>
     * Add -P (--password-only-menu) to SWAT for displaying only the
       password change page to non-root users.
diff --git a/source/client/smbmnt.c b/source/client/smbmnt.c
index 753a31c3139..06dd3e5c023 100644
--- a/source/client/smbmnt.c
+++ b/source/client/smbmnt.c
@@ -162,7 +162,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
 
 	slprintf(opts, sizeof(opts)-1,
 		 "version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
-		 data->uid, data->gid, data->file_mode, data->dir_mode,options);
+		 mount_uid, mount_gid, data->file_mode, data->dir_mode,options);
 	if (mount(share_name, ".", "smbfs", flags, data1) == 0)
 		return 0;
 	return mount(share_name, ".", "smbfs", flags, data2);
@@ -225,7 +225,7 @@ do_mount(char *share_name, unsigned int flags, struct smb_mount_data *data)
                 return -1;
         }
 
-        data.uid = mount_uid;
+        data.uid = mount_uid;    // truncates to 16-bits here!!!
         data.gid = mount_gid;
         data.file_mode = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_fmask;
         data.dir_mode  = (S_IRWXU|S_IRWXG|S_IRWXO) & mount_dmask;
diff --git a/source/client/smbumount.c b/source/client/smbumount.c
index 9ea3083a6f9..29a7b5dafc1 100644
--- a/source/client/smbumount.c
+++ b/source/client/smbumount.c
@@ -39,7 +39,7 @@ umount_ok(const char *mount_point)
 	/* we set O_NOFOLLOW to prevent users playing games with symlinks to
 	   umount filesystems they don't own */
         int fid = open(mount_point, O_RDONLY|O_NOFOLLOW, 0);
-        __kernel_uid_t mount_uid;
+        __kernel_uid32_t mount_uid;
 	
         if (fid == -1) {
                 fprintf(stderr, "Could not open %s: %s\n",
@@ -47,10 +47,14 @@ umount_ok(const char *mount_point)
                 return -1;
         }
         
-        if (ioctl(fid, SMB_IOC_GETMOUNTUID, &mount_uid) != 0) {
-                fprintf(stderr, "%s probably not smb-filesystem\n",
-                        mount_point);
-                return -1;
+        if (ioctl(fid, SMB_IOC_GETMOUNTUID32, &mount_uid) != 0) {
+                __kernel_uid_t mount_uid16;
+                if (ioctl(fid, SMB_IOC_GETMOUNTUID, &mount_uid16) != 0) {
+                        fprintf(stderr, "%s probably not smb-filesystem\n",
+                                mount_point);
+                        return -1;
+                }
+                mount_uid = mount_uid16;
         }
 
         if ((getuid() != 0)
diff --git a/source/libads/ldap.c b/source/libads/ldap.c
index 494bd930e4e..c9bba725246 100644
--- a/source/libads/ldap.c
+++ b/source/libads/ldap.c
@@ -2526,7 +2526,7 @@ ADS_STATUS ads_workgroup_name(ADS_STRUCT *ads, TALLOC_CTX *mem_ctx, const char *
 	int i;
 	void *res;
 	const char *attrs[] = {"servicePrincipalName", NULL};
-	int num_principals;
+	size_t num_principals;
 
 	(*workgroup) = NULL;
 
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c
index bfd8dd45ee5..ffe82b0bd26 100644
--- a/source/nsswitch/pam_winbind.c
+++ b/source/nsswitch/pam_winbind.c
@@ -4,7 +4,7 @@
    Copyright Tim Potter <tpot@samba.org> 2000
    Copyright Andrew Bartlett <abartlet@samba.org> 2002
 
-   largely based on pam_userdb by Christian Gafton <gafton@redhat.com> 
+   largely based on pam_userdb by Cristian Gafton <gafton@redhat.com> 
    also contains large slabs of code from pam_unix by Elliot Lee <sopwith@redhat.com>
    (see copyright below for full details)
 */
@@ -696,7 +696,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags,
 		lctrl = ctrl;
 		
 		if (on(WINBIND_USE_AUTHTOK_ARG, lctrl)) {
-			ctrl = WINBIND_USE_FIRST_PASS_ARG | lctrl;
+			lctrl |= WINBIND_USE_FIRST_PASS_ARG;
 		}
 		retry = 0;
 		retval = PAM_AUTHTOK_ERR;
diff --git a/source/nsswitch/winbindd_ads.c b/source/nsswitch/winbindd_ads.c
index 335e21adcbe..88a7d3ed3b1 100644
--- a/source/nsswitch/winbindd_ads.c
+++ b/source/nsswitch/winbindd_ads.c
@@ -651,7 +651,8 @@ static NTSTATUS lookup_groupmem(struct winbindd_domain *domain,
 	NTSTATUS status = NT_STATUS_UNSUCCESSFUL;
 	char *sidstr;
 	char **members;
-	int i, num_members;
+	int i;
+	size_t num_members;
 	fstring sid_string;
 	BOOL more_values;
 	const char **attrs;