diff options
| author | Andrew Tridgell <tridge@samba.org> | 2000-05-10 10:41:59 +0000 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2000-05-10 10:41:59 +0000 |
| commit | 49a0e6d5989656c1b3c9c063a20308ca4ee5d73b (patch) | |
| tree | 6c89da7fcb785e86a55c92a813045b9fc3712f51 /source3/smbd/service.c | |
| parent | ddc9b8b40642c90fe7c34b088eae4f8075f4033a (diff) | |
| download | samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.tar.gz samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.tar.bz2 samba-49a0e6d5989656c1b3c9c063a20308ca4ee5d73b.zip | |
more merging voodoo
this adds "#define OLD_NTDOMAIN 1" in lots of places. Don't panic -
this isn't permanent, it should go after another few merge steps have
been done
(This used to be commit 92109d7b3c06f240452d39f669ecb8c9c86ab610)
Diffstat (limited to 'source3/smbd/service.c')
| -rw-r--r-- | source3/smbd/service.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/source3/smbd/service.c b/source3/smbd/service.c index 0701b854b7..71d718154d 100644 --- a/source3/smbd/service.c +++ b/source3/smbd/service.c @@ -1,3 +1,5 @@ +#define OLD_NTDOMAIN 1 + /* Unix SMB/Netbios implementation. Version 1.9. @@ -684,3 +686,5 @@ void close_cnum(connection_struct *conn, uint16 vuid) } conn_free(conn); } + +#undef OLD_NTDOMAIN |