1 diff -uNr samba-3.0alpha22.orig/source/client/smbmnt.c samba-3.0alpha22/source/client/smbmnt.c
2 --- samba-3.0alpha22.orig/source/client/smbmnt.c 2003-03-15 12:11:39.000000000 -0600
3 +++ samba-3.0alpha22/source/client/smbmnt.c 2003-03-15 12:11:49.000000000 -0600
5 static uid_t mount_uid;
6 static gid_t mount_gid;
9 static unsigned mount_fmask;
10 static unsigned mount_dmask;
11 static int user_mount;
13 printf("Usage: smbmnt mount-point [options]\n");
14 printf("Version %s\n\n",VERSION);
15 printf("-s share share name on server\n"
16 + "-n don't update /etc/mtab\n"
17 "-r mount read-only\n"
18 "-u uid mount as uid\n"
19 "-g gid mount as gid\n"
24 - while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
25 + while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
30 mount_gid = strtol(optarg, NULL, 0);
43 - if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
45 - fprintf(stderr, "Can't get "MOUNTED"~ lock file");
50 + if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
52 + fprintf(stderr, "Can't get "MOUNTED"~ lock file");
57 - if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
59 - fprintf(stderr, "Can't open " MOUNTED);
62 + if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
64 + fprintf(stderr, "Can't open " MOUNTED);
68 - if (addmntent(mtab, &ment) == 1)
70 - fprintf(stderr, "Can't write mount entry");
73 - if (fchmod(fileno(mtab), 0644) == -1)
75 - fprintf(stderr, "Can't set perms on "MOUNTED);
79 + if (addmntent(mtab, &ment) == 1)
81 + fprintf(stderr, "Can't write mount entry");
84 + if (fchmod(fileno(mtab), 0644) == -1)
86 + fprintf(stderr, "Can't set perms on "MOUNTED);
91 - if (unlink(MOUNTED"~") == -1)
93 - fprintf(stderr, "Can't remove "MOUNTED"~");
96 + if (unlink(MOUNTED"~") == -1)
98 + fprintf(stderr, "Can't remove "MOUNTED"~");
105 diff -uNr samba-3.0alpha22.orig/source/client/smbmount.c samba-3.0alpha22/source/client/smbmount.c
106 --- samba-3.0alpha22.orig/source/client/smbmount.c 2003-03-15 12:04:29.000000000 -0600
107 +++ samba-3.0alpha22/source/client/smbmount.c 2003-03-15 12:15:10.000000000 -0600
110 static unsigned mount_fmask;
111 static unsigned mount_dmask;
112 +static BOOL no_mtab = False;
113 static BOOL use_kerberos;
114 /* TODO: Add code to detect smbfs version in kernel */
115 static BOOL status32_smbfs = False;
123 if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
124 DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", sys_getpid()));
137 ****************************************************************************/
138 static void usage(void)
140 - printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
141 + printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
143 printf("Version %s\n\n",VERSION);
149 - opt = getopt(argc, argv, "o:");
151 + opt = getopt(argc, argv, "no:");
153 + DEBUG(3,("No mtab!\n"));
155 + opt = getopt(argc, argv, "o:");