Tidyups and things I discovered during the merge...

Jeremy.
(This used to be commit 9c8439f25b90d80adcd7161bfed3664af6256940)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 89ab1b50a4abbb03832d7a2851c7305b08e100c8..fde3fc30f2c6aacc835cd7eb0c8e0fb77927970e 100644 (file)
--- 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 67d8d89b0155f7b384229c58cf08d1a3b40d48c8..181a385592656e1a6dcb711feec02f600101b5f8 100644 (file)
--- 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;