Bring smbmount.c in line with jra's global-cide. global_scope was used here...

[kai/samba.git] / source / client / smbmount.c

diff --git a/source/client/smbmount.c b/source/client/smbmount.c
index ad050063ec4e7dbd0b679d440829426a79def887..d8f5e1b394f2e20911d4bccd96464beb6e250402 100644 (file)
--- a/source/client/smbmount.c
+++ b/source/client/smbmount.c
@@ -28,8 +28,6 @@
 
 extern BOOL in_client;
 extern pstring user_socket_options;
-extern BOOL append_log;
-extern fstring remote_machine;
 
 static pstring credentials;
 static pstring my_netbios_name;
@@ -377,9 +375,8 @@ static void send_fs_socket(char *the_service, char *mount_point, struct cli_stat
                        }
 
                        /* here we are no longer interactive */
-                       pstrcpy(remote_machine, "smbmount");    /* sneaky ... */
+                       set_remote_machine_name("smbmount");    /* sneaky ... */
                        setup_logging("mount.smbfs", False);
-                       append_log = True;
                        reopen_logs();
                        DEBUG(0, ("mount.smbfs: entering daemon mode for service %s, pid=%d\n", the_service, sys_getpid()));
 
@@ -684,7 +681,6 @@ static void parse_mount_smb(int argc, char **argv)
        char *opteq;
        extern char *optarg;
        int val;
-       extern pstring global_scope;
        char *p;
 
        if (argc < 2 || argv[1][0] == '-') {
@@ -765,7 +761,7 @@ static void parse_mount_smb(int argc, char **argv)
                        } else if(!strcmp(opts, "sockopt")) {
                                pstrcpy(user_socket_options,opteq+1);
                        } else if(!strcmp(opts, "scope")) {
-                               pstrcpy(global_scope,opteq+1);
+                               pstrcpy(global_scope(),opteq+1);
                        } else {
                                slprintf(p, sizeof(pstring) - (p - options) - 1, "%s=%s,", opts, opteq+1);
                                p += strlen(p);