[Pkg-samba-maint] r1602 - branches/samba/no-more-smbfs/debian/patches
vorlon at alioth.debian.org
vorlon at alioth.debian.org
Sat Nov 24 10:05:10 UTC 2007
Author: vorlon
Date: 2007-11-24 10:05:10 +0000 (Sat, 24 Nov 2007)
New Revision: 1602
Removed:
branches/samba/no-more-smbfs/debian/patches/missing_userspace_bugzilla999.patch
Modified:
branches/samba/no-more-smbfs/debian/patches/series
Log:
drop missing_userspace_bugzilla999.patch, which only applies to smbfs
Deleted: branches/samba/no-more-smbfs/debian/patches/missing_userspace_bugzilla999.patch
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/missing_userspace_bugzilla999.patch 2007-11-24 10:03:56 UTC (rev 1601)
+++ branches/samba/no-more-smbfs/debian/patches/missing_userspace_bugzilla999.patch 2007-11-24 10:05:10 UTC (rev 1602)
@@ -1,144 +0,0 @@
-Goal: Userspaces fixes to properly use uid and gid options with kernel 2.6
-
-Fixes: Bugzilla #999
-
-Status wrt upstream: Not applied. Mentioned by Dann Frazier in
- http://lists.samba.org/archive/samba-technical/2007-January/051069.html
- Jerry Carter agreed to apply but not applied yet
- Reminded to upstream on June 3rd 2007
-
-Author: Haroldo Gamal (see https://bugzilla.samba.org/attachment.cgi?id=634&action=view)
-
-
-Index: samba-3.0.25c/source/client/smbmnt.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmnt.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmnt.c 2007-08-26 13:09:07.919433127 +0200
-@@ -49,6 +49,10 @@
- static unsigned mount_dmask;
- static int user_mount;
- static char *options;
-+static int opt_uid = 0;
-+static int opt_gid = 0;
-+static int opt_fmode = 0;
-+static int opt_dmode = 0;
-
- static void
- help(void)
-@@ -82,11 +86,13 @@
- case 'u':
- if (!user_mount) {
- mount_uid = strtol(optarg, NULL, 0);
-+ opt_uid++;
- }
- break;
- case 'g':
- if (!user_mount) {
- mount_gid = strtol(optarg, NULL, 0);
-+ opt_gid++;
- }
- break;
- case 'n':
-@@ -97,9 +103,11 @@
- break;
- case 'f':
- mount_fmask = strtol(optarg, NULL, 8);
-+ opt_fmode++;
- break;
- case 'd':
- mount_dmask = strtol(optarg, NULL, 8);
-+ opt_dmode++;
- break;
- case 'o':
- options = optarg;
-@@ -182,9 +190,17 @@
- data2 = (char *) data;
- }
-
-- slprintf(opts, sizeof(opts)-1,
-- "version=7,uid=%d,gid=%d,file_mode=0%o,dir_mode=0%o,%s",
-- mount_uid, mount_gid, data->file_mode, data->dir_mode,options);
-+ slprintf(opts, sizeof(opts)-1, "version=7,");
-+ if (opt_uid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "uid=%d,", mount_uid);
-+ if (opt_gid)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "gid=%d,", mount_gid);
-+ if (opt_fmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "file_mode=%d,", data->file_mode);
-+ if (opt_dmode)
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "dir_mode=%d,", data->dir_mode);
-+ slprintf(opts+strlen(opts), sizeof(opts)-strlen(opts)-1, "%s",options);
-+
- if (mount(share_name, ".", "smbfs", flags, data1) == 0)
- return 0;
- return mount(share_name, ".", "smbfs", flags, data2);
-@@ -213,6 +229,8 @@
-
- if (getuid() != 0) {
- user_mount = 1;
-+ opt_uid++;
-+ opt_gid++;
- }
-
- if (geteuid() != 0) {
-Index: samba-3.0.25c/source/client/smbmount.c
-===================================================================
---- samba-3.0.25c.orig/source/client/smbmount.c 2007-08-26 13:09:03.919628296 +0200
-+++ samba-3.0.25c/source/client/smbmount.c 2007-08-26 13:09:07.919433127 +0200
-@@ -43,6 +43,10 @@
- static int smb_port = 0;
- static BOOL got_user;
- static BOOL got_pass;
-+static BOOL use_uid = 0;
-+static BOOL use_gid = 0;
-+static BOOL use_fmask = 0;
-+static BOOL use_dmask = 0;
- static uid_t mount_uid;
- static gid_t mount_gid;
- static int mount_ro;
-@@ -480,22 +484,22 @@
- if (mount_ro) {
- args[i++] = "-r";
- }
-- if (mount_uid) {
-+ if (use_uid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_uid);
- args[i++] = "-u";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_gid) {
-+ if (use_gid) {
- slprintf(tmp, sizeof(tmp)-1, "%d", mount_gid);
- args[i++] = "-g";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_fmask) {
-+ if (use_fmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_fmask);
- args[i++] = "-f";
- args[i++] = smb_xstrdup(tmp);
- }
-- if (mount_dmask) {
-+ if (use_dmask) {
- slprintf(tmp, sizeof(tmp)-1, "0%o", mount_dmask);
- args[i++] = "-d";
- args[i++] = smb_xstrdup(tmp);
-@@ -800,14 +804,18 @@
- pstrcpy(my_netbios_name,opteq+1);
- } else if(!strcmp(opts, "uid")) {
- mount_uid = nametouid(opteq+1);
-+ use_uid++;
- } else if(!strcmp(opts, "gid")) {
- mount_gid = nametogid(opteq+1);
-+ use_gid++;
- } else if(!strcmp(opts, "port")) {
- smb_port = val;
- } else if(!strcmp(opts, "fmask")) {
- mount_fmask = strtol(opteq+1, NULL, 8);
-+ use_fmask++;
- } else if(!strcmp(opts, "dmask")) {
- mount_dmask = strtol(opteq+1, NULL, 8);
-+ use_dmask++;
- } else if(!strcmp(opts, "debug")) {
- DEBUGLEVEL = val;
- } else if(!strcmp(opts, "ip")) {
Modified: branches/samba/no-more-smbfs/debian/patches/series
===================================================================
--- branches/samba/no-more-smbfs/debian/patches/series 2007-11-24 10:03:56 UTC (rev 1601)
+++ branches/samba/no-more-smbfs/debian/patches/series 2007-11-24 10:05:10 UTC (rev 1602)
@@ -16,7 +16,6 @@
VERSION.patch
adapt_machine_creation_script.patch
autoconf.patch
-missing_userspace_bugzilla999.patch
linux-cifs-user-perms.patch
cifs-umount-same-user.patch
smbpasswd-syslog.patch
More information about the Pkg-samba-maint
mailing list