1
0
mirror of https://github.com/samba-team/samba.git synced 2025-12-07 20:23:50 +03:00

Tidyups and things I discovered during the merge...

Jeremy.
This commit is contained in:
Jeremy Allison
-
parent 08df688b28
commit 9c8439f25b
2 changed files with 5 additions and 5 deletions

View File

@@ -776,7 +776,7 @@ typedef struct smb_wpasswd {
#define MAP_FILE 0 #define MAP_FILE 0
#endif #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 #define USE_SMBPASS_DB 1
#endif #endif

View File

@@ -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)) if (!prs_align(ps))
return False; return False;
if (!smb_io_pol_hnd("", &(r_r->pol), ps, depth)) if (!smb_io_pol_hnd("", &r_r->pol, ps, depth))
return False; return False;
if (!prs_ntstatus("status", ps, depth, &(r_r->status))) if (!prs_ntstatus("status", ps, depth, &r_r->status))
return False; return False;
return True; 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)) if(!prs_align(ps))
return False; return False;
if(!prs_ntstatus("status", ps, depth, &(r_s->status))) if(!prs_ntstatus("status", ps, depth, &r_s->status))
return False; return False;
return True; return True;
@@ -1673,7 +1673,7 @@ BOOL reg_io_r_abort_shutdown(char *desc, REG_R_ABORT_SHUTDOWN * r_s,
if (!prs_align(ps)) if (!prs_align(ps))
return False; return False;
if (!prs_ntstatus("status", ps, depth, &(r_s->status))) if (!prs_ntstatus("status", ps, depth, &r_s->status))
return False; return False;
return True; return True;