summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2001-11-15 21:06:41 +0000
committerJeremy Allison <jra@samba.org>2001-11-15 21:06:41 +0000
commit186726b7f85f3e84c9ad900262da93471570498e (patch)
treee773a9b70cab1b5136987ae9fbe3a41c5604a9b0
parentdecc9a8985c7cbcf32a1bc8ea939d335f1dee93b (diff)
downloadsamba-186726b7f85f3e84c9ad900262da93471570498e.tar.gz
samba-186726b7f85f3e84c9ad900262da93471570498e.tar.bz2
samba-186726b7f85f3e84c9ad900262da93471570498e.zip
Tidyups and things I discovered during the merge...
Jeremy. (This used to be commit 9c8439f25b90d80adcd7161bfed3664af6256940)
-rw-r--r--source3/include/includes.h2
-rw-r--r--source3/rpc_parse/parse_reg.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/source3/include/includes.h b/source3/include/includes.h
index 89ab1b50a4..fde3fc30f2 100644
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -776,7 +776,7 @@ typedef struct smb_wpasswd {
#define MAP_FILE 0
#endif
-#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDBSAM))
+#if (!defined(WITH_NISPLUS) && !defined(WITH_LDAP) && !defined(WITH_TDB_SAM))
#define USE_SMBPASS_DB 1
#endif
diff --git a/source3/rpc_parse/parse_reg.c b/source3/rpc_parse/parse_reg.c
index 67d8d89b01..181a385592 100644
--- a/source3/rpc_parse/parse_reg.c
+++ b/source3/rpc_parse/parse_reg.c
@@ -153,10 +153,10 @@ BOOL reg_io_r_open_hklm(char *desc, REG_R_OPEN_HKLM * r_r, prs_struct *ps,
if (!prs_align(ps))
return False;
- if (!smb_io_pol_hnd("", &(r_r->pol), ps, depth))
+ if (!smb_io_pol_hnd("", &r_r->pol, ps, depth))
return False;
- if (!prs_ntstatus("status", ps, depth, &(r_r->status)))
+ if (!prs_ntstatus("status", ps, depth, &r_r->status))
return False;
return True;
@@ -1618,7 +1618,7 @@ BOOL reg_io_r_shutdown(char *desc, REG_R_SHUTDOWN * r_s, prs_struct *ps,
if(!prs_align(ps))
return False;
- if(!prs_ntstatus("status", ps, depth, &(r_s->status)))
+ if(!prs_ntstatus("status", ps, depth, &r_s->status))
return False;
return True;
@@ -1673,7 +1673,7 @@ BOOL reg_io_r_abort_shutdown(char *desc, REG_R_ABORT_SHUTDOWN * r_s,
if (!prs_align(ps))
return False;
- if (!prs_ntstatus("status", ps, depth, &(r_s->status)))
+ if (!prs_ntstatus("status", ps, depth, &r_s->status))
return False;
return True;