1 --- samba-2.2.3a/source/client/smbmnt.c.orig Tue Apr 2 09:58:18 2002
2 +++ samba-2.2.3a/source/client/smbmnt.c Tue Apr 2 09:58:24 2002
4 static uid_t mount_uid;
5 static gid_t mount_gid;
8 static unsigned mount_fmask;
9 static unsigned mount_dmask;
10 static int user_mount;
12 printf("Usage: smbmnt mount-point [options]\n");
13 printf("Version %s\n\n",VERSION);
14 printf("-s share share name on server\n"
15 + "-n don't update /etc/mtab\n"
16 "-r mount read-only\n"
17 "-u uid mount as uid\n"
18 "-g gid mount as gid\n"
23 - while ((opt = getopt (argc, argv, "s:u:g:rf:d:o:")) != EOF)
24 + while ((opt = getopt (argc, argv, "s:u:g:nrf:d:o:")) != EOF)
29 mount_gid = strtol(optarg, NULL, 0);
42 - if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
44 - fprintf(stderr, "Can't get "MOUNTED"~ lock file");
49 + if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1)
51 + fprintf(stderr, "Can't get "MOUNTED"~ lock file");
56 - if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
58 - fprintf(stderr, "Can't open " MOUNTED);
61 + if ((mtab = setmntent(MOUNTED, "a+")) == NULL)
63 + fprintf(stderr, "Can't open " MOUNTED);
67 - if (addmntent(mtab, &ment) == 1)
69 - fprintf(stderr, "Can't write mount entry");
72 - if (fchmod(fileno(mtab), 0644) == -1)
74 - fprintf(stderr, "Can't set perms on "MOUNTED);
78 + if (addmntent(mtab, &ment) == 1)
80 + fprintf(stderr, "Can't write mount entry");
83 + if (fchmod(fileno(mtab), 0644) == -1)
85 + fprintf(stderr, "Can't set perms on "MOUNTED);
90 - if (unlink(MOUNTED"~") == -1)
92 - fprintf(stderr, "Can't remove "MOUNTED"~");
95 + if (unlink(MOUNTED"~") == -1)
97 + fprintf(stderr, "Can't remove "MOUNTED"~");
104 --- samba/source/client/smbmount.c.orig 2002-10-13 01:34:58.000000000 -0400
105 +++ samba/source/client/smbmount.c 2002-10-13 01:34:59.000000000 -0400
108 static unsigned mount_fmask;
109 static unsigned mount_dmask;
110 +static BOOL no_mtab = False;
112 static void usage(void);
121 if ((fd = open(MOUNTED"~", O_RDWR|O_CREAT|O_EXCL, 0600)) == -1) {
122 DEBUG(0,("%d: Can't get "MOUNTED"~ lock file", getpid()));
135 ****************************************************************************/
136 static void usage(void)
138 - printf("Usage: mount.smbfs service mountpoint [-o options,...]\n");
139 + printf("Usage: mount.smbfs service mountpoint [-n] [-o options,...]\n");
141 printf("Version %s\n\n",VERSION);
147 - opt = getopt(argc, argv, "o:");
149 + opt = getopt(argc, argv, "no:");
151 + DEBUG(3,("No mtab!\n"));
153 + opt = getopt(argc, argv, "o:");