diff options
| author | Jeremy Allison <jra@samba.org> | 2002-11-13 21:47:21 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2002-11-13 21:47:21 +0000 |
| commit | 38c6b90bf8b288426779f3eedcfd643c65a07ef7 (patch) | |
| tree | 9860d4dae387fd025eaae37ce96c58e5659239b2 /source3/smbwrapper | |
| parent | 89d6a36b8594fa7cfab082b0d4eb93caed0fdeae (diff) | |
| download | samba-38c6b90bf8b288426779f3eedcfd643c65a07ef7.tar.gz samba-38c6b90bf8b288426779f3eedcfd643c65a07ef7.tar.bz2 samba-38c6b90bf8b288426779f3eedcfd643c65a07ef7.zip | |
Fix smbwrapper from the global_* changes.
Jeremy.
(This used to be commit 6ab12ca80d12fcecf6ad3a534bd73b482d991112)
Diffstat (limited to 'source3/smbwrapper')
| -rw-r--r-- | source3/smbwrapper/smbsh.c | 2 | ||||
| -rw-r--r-- | source3/smbwrapper/smbw.c | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/source3/smbwrapper/smbsh.c b/source3/smbwrapper/smbsh.c index 0d705ddcfa..f9697223c4 100644 --- a/source3/smbwrapper/smbsh.c +++ b/source3/smbwrapper/smbsh.c @@ -36,7 +36,7 @@ static void smbsh_usage(void) int main(int argc, char *argv[]) { char *p, *u; - char *libd = dyn_BINDIR; + const char *libd = dyn_BINDIR; pstring line, wd; int opt; extern char *optarg; diff --git a/source3/smbwrapper/smbw.c b/source3/smbwrapper/smbw.c index 2dd7c4ea6d..005d9af53f 100644 --- a/source3/smbwrapper/smbw.c +++ b/source3/smbwrapper/smbw.c @@ -27,7 +27,6 @@ static struct smbw_file *smbw_files; static struct smbw_server *smbw_srvs; struct bitmap *smbw_file_bmap; -extern pstring global_myname; fstring smbw_prefix = SMBW_PREFIX; @@ -79,7 +78,8 @@ void smbw_init(void) lp_load(dyn_CONFIGFILE,True,False,False); - get_myname(global_myname); + if (!init_names()) + exit(1); if ((p=smbw_getshared("DEBUG"))) { DEBUGLEVEL = atoi(p); @@ -461,7 +461,7 @@ struct smbw_server *smbw_server(char *server, char *share) return NULL; } - make_nmb_name(&calling, global_myname, 0x0); + make_nmb_name(&calling, global_myname(), 0x0); make_nmb_name(&called , server, 0x20); DEBUG(4,("server_n=[%s] server=[%s]\n", server_n, server)); |