diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2002-11-13 07:04:00 +0000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2002-11-13 07:04:00 +0000 |
| commit | 098c08ccabe164492d6a91372608f5feb0de0d47 (patch) | |
| tree | 7421c6961dd6f588785f0877c19a3277e5bdf4ac /source3/libsmb | |
| parent | ce35c5d0fa62b3940cb76ed6d65712f8e2a15de4 (diff) | |
| download | samba-098c08ccabe164492d6a91372608f5feb0de0d47.tar.gz samba-098c08ccabe164492d6a91372608f5feb0de0d47.tar.bz2 samba-098c08ccabe164492d6a91372608f5feb0de0d47.zip | |
Merge from HEAD
- make configure check for the location of Heimdal KRB5 on suse systems
- fix libsmbclient for new global_myname()
(This used to be commit 111b0405cf8c95da5c927f31e5db7fd51c590b1f)
Diffstat (limited to 'source3/libsmb')
| -rw-r--r-- | source3/libsmb/libsmbclient.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source3/libsmb/libsmbclient.c b/source3/libsmb/libsmbclient.c index faa4191e6d..a1fb380c37 100644 --- 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 { /* |