diff options
| author | Jeremy Allison <jra@samba.org> | 1998-02-24 17:59:34 +0000 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 1998-02-24 17:59:34 +0000 |
| commit | 834ef5624421dfdb4665012ea43aa37d092efe40 (patch) | |
| tree | 0ef94ac1c248e8c27acb89829c1e4cbb583c47e1 /source3/utils | |
| parent | c16d4aec00230983973be3b827d1209f5db65d9c (diff) | |
| download | samba-834ef5624421dfdb4665012ea43aa37d092efe40.tar.gz samba-834ef5624421dfdb4665012ea43aa37d092efe40.tar.bz2 samba-834ef5624421dfdb4665012ea43aa37d092efe40.zip | |
nmbd_incomingdgrams.c: Fix for typo.
nmbd_sendannounce.c: Remote announcement was announcing to the wrong name !
nmblookup.c: Fix for substitutions not seeing hostname.
testparm.c: Fix for substitutions not seeing hostname.
wsmbstatus.c: Fix for substitutions not seeing hostname.
util.c: Change read_udp_socket to use sockaddr_in rather than dubiously
messing around with an opaque data type (sockaddr).
Jeremy.
(This used to be commit 776ccf5c0641b5aa300236c2612b5f2761d1179f)
Diffstat (limited to 'source3/utils')
| -rw-r--r-- | source3/utils/nmblookup.c | 3 | ||||
| -rw-r--r-- | source3/utils/testparm.c | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/source3/utils/nmblookup.c b/source3/utils/nmblookup.c index 5cd5a869a9..a73a35cd56 100644 --- a/source3/utils/nmblookup.c +++ b/source3/utils/nmblookup.c @@ -170,12 +170,13 @@ int main(int argc,char *argv[]) exit(1); } + init_structs(); + if (!lp_load(servicesf,True)) { fprintf(stderr, "Can't load %s - run testparm to debug it\n", servicesf); } load_interfaces(); - init_structs(); if (!open_sockets()) return(1); if (!got_bcast) diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index cc35d2d530..a35a3fd71e 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -38,6 +38,7 @@ /* these live in util.c */ extern FILE *dbf; extern int DEBUGLEVEL; +extern pstring myhostname; int main(int argc, char *argv[]) { @@ -60,6 +61,12 @@ extern int DEBUGLEVEL; printf("Load smb config files from %s\n",configfile); + if(!get_myname(myhostname,NULL)) + { + printf("Failed to get my hostname.\n"); + return(1); + } + if (!lp_load(configfile,False)) { printf("Error loading services.\n"); |