[Pkg-samba-maint] r1442 - trunk/samba/debian/patches

[bubulle at alioth.debian.org]

Author: bubulle
Date: 2007-06-03 17:06:40 +0000 (Sun, 03 Jun 2007)
New Revision: 1442

Modified:
   trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
Log:
Refresh patch after dropping smbmount-unix-caps.patch


Modified: trunk/samba/debian/patches/missing_userspace_bugzilla999.patch
===================================================================
--- trunk/samba/debian/patches/missing_userspace_bugzilla999.patch	2007-06-03 17:02:55 UTC (rev 1441)
+++ trunk/samba/debian/patches/missing_userspace_bugzilla999.patch	2007-06-03 17:06:40 UTC (rev 1442)
@@ -11,8 +11,8 @@
 
 Index: samba-3.0.25a/source/client/smbmnt.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmnt.c	2007-06-03 14:45:55.284942463 +0200
-+++ samba-3.0.25a/source/client/smbmnt.c	2007-06-03 18:48:17.111694949 +0200
+--- samba-3.0.25a.orig/source/client/smbmnt.c	2007-06-03 19:05:54.072802810 +0200
++++ samba-3.0.25a/source/client/smbmnt.c	2007-06-03 19:06:00.072588923 +0200
 @@ -49,6 +49,10 @@
  static unsigned mount_dmask;
  static int user_mount;
@@ -73,8 +73,8 @@
  	return mount(share_name, ".", "smbfs", flags, data2);
 Index: samba-3.0.25a/source/client/smbmount.c
 ===================================================================
---- samba-3.0.25a.orig/source/client/smbmount.c	2007-06-03 14:45:55.284942463 +0200
-+++ samba-3.0.25a/source/client/smbmount.c	2007-06-03 18:45:36.618010848 +0200
+--- samba-3.0.25a.orig/source/client/smbmount.c	2007-06-03 19:05:54.072802810 +0200
++++ samba-3.0.25a/source/client/smbmount.c	2007-06-03 19:06:00.072588924 +0200
 @@ -43,6 +43,10 @@
  static int smb_port = 0;
  static BOOL got_user;
@@ -86,7 +86,7 @@
  static uid_t mount_uid;
  static gid_t mount_gid;
  static int mount_ro;
-@@ -484,22 +488,22 @@
+@@ -480,22 +484,22 @@
  	if (mount_ro) {
  		args[i++] = "-r";
  	}
@@ -113,7 +113,7 @@
  		slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
  		args[i++] = "-d";
  		args[i++] = smb_xstrdup(tmp);
-@@ -801,14 +805,18 @@
+@@ -797,14 +801,18 @@
  				pstrcpy(my_netbios_name,opteq+1);
  			} else if(!strcmp(opts, "uid")) {
  				mount_uid = nametouid(opteq+1);