Merge from HEAD

[ira/wip.git] / source3 / libsmb / libsmbclient.c

diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c
index faa4191e6dd42a448fb9eac6e2864f04df0bf8ed..a1fb380c37f62696b36e6519ec72a402cb3da990 100644 (file)
--- a/source3/libsmb/libsmbclient.c
+++ b/source3/libsmb/libsmbclient.c
@@ -46,7 +46,6 @@ static int DLIST_CONTAINS(SMBCFILE * list, SMBCFILE *p) {
 }
 
 extern BOOL in_client;
-extern pstring global_myname;
 
 /*
  * Is the logging working / configfile read ? 
@@ -2596,8 +2595,8 @@ SMBCCTX * smbc_init_context(SMBCCTX * context)
                 * We try to get our netbios name from the config. If that fails we fall
                 * back on constructing our netbios name from our hostname etc
                 */
-               if (global_myname) {
-                       context->netbios_name = strdup(global_myname);
+               if (global_myname()) {
+                       context->netbios_name = strdup(global_myname());
                }
                else {
                        /*