diff options
| author | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
|---|---|---|
| committer | Tim Potter <tpot@samba.org> | 2002-11-29 02:58:59 +0000 |
| commit | f3e3a56ea9085b186af24b0b4e911863fd9ceacc (patch) | |
| tree | 994a10565d8ce8ff296fe3153433090e7570b271 /source3/include | |
| parent | 8986bdf7072a9d9f100767a4546c70cdf69a72b2 (diff) | |
| download | samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.gz samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.tar.bz2 samba-f3e3a56ea9085b186af24b0b4e911863fd9ceacc.zip | |
Merge a bunch of trivial changes from HEAD. The difference remaining
should actual functional differences between HEAD and 3.0.
- Mostly reformatting
- Removal of unecessary #include "smb.h"
- Merge of dyn_DRIVERFILE removal
- Silly bug fix for python code
(This used to be commit d3998307adc50ba50defe610cb656c73799ae3b9)
Diffstat (limited to 'source3/include')
| -rw-r--r-- | source3/include/dynconfig.h | 1 | ||||
| -rw-r--r-- | source3/include/smb.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/source3/include/dynconfig.h b/source3/include/dynconfig.h index f8b3bbb791..fcc4c88b2b 100644 --- a/source3/include/dynconfig.h +++ b/source3/include/dynconfig.h @@ -32,6 +32,5 @@ extern pstring dyn_LOGFILEBASE, dyn_LMHOSTSFILE; extern pstring dyn_LIBDIR; extern const pstring dyn_LOCKDIR; extern const pstring dyn_PIDDIR; -extern const pstring dyn_DRIVERFILE; extern const pstring dyn_SMB_PASSWD_FILE; extern const pstring dyn_PRIVATE_DIR; diff --git a/source3/include/smb.h b/source3/include/smb.h index 310fd1ace5..83125989df 100644 --- a/source3/include/smb.h +++ b/source3/include/smb.h @@ -953,7 +953,7 @@ struct bitmap { #define SMBntcancel 0xA4 /* NT cancel */ /* These are the trans subcommands */ -#define TRANSACT_SETNAMEDPIPEHANDLESTATE 0x01 +#define TRANSACT_SETNAMEDPIPEHANDLESTATE 0x01 #define TRANSACT_DCERPCCMD 0x26 #define TRANSACT_WAITNAMEDPIPEHANDLESTATE 0x53 |