diff options
| -rw-r--r-- | source/lib/messages.c | 2 | ||||
| -rw-r--r-- | source/lib/msrpc_use.c | 2 | ||||
| -rw-r--r-- | source/lib/util_sid.c | 10 | ||||
| -rw-r--r-- | source/lib/util_unistr.c | 8 |
4 files changed, 13 insertions, 9 deletions
diff --git a/source/lib/messages.c b/source/lib/messages.c index 2409e5b1e88..258610f409a 100644 --- a/source/lib/messages.c +++ b/source/lib/messages.c @@ -89,7 +89,7 @@ BOOL message_init(void) return False; } - CatchSignal(SIGUSR1, sig_usr1); + CatchSignal(SIGUSR1, SIGNAL_CAST sig_usr1); message_register(MSG_PING, ping_message); diff --git a/source/lib/msrpc_use.c b/source/lib/msrpc_use.c index cf6f63c669f..7558a266b3e 100644 --- a/source/lib/msrpc_use.c +++ b/source/lib/msrpc_use.c @@ -148,7 +148,7 @@ static struct msrpc_use *msrpc_find(const char* pipe_name, continue; } if (!usr_creds->reuse && - !pwd_compare(&usr_creds->ntc.pwd, &c->cli->usr.ntc.pwd)) + !pwd_compare((struct pwd_info *)&usr_creds->ntc.pwd, &c->cli->usr.ntc.pwd)) { DEBUG(100,("password doesn't match\n")); continue; diff --git a/source/lib/util_sid.c b/source/lib/util_sid.c index b4b88c9d888..80254318c48 100644 --- a/source/lib/util_sid.c +++ b/source/lib/util_sid.c @@ -51,8 +51,12 @@ typedef struct _known_sid_users { } known_sid_users; /* static known_sid_users no_users[] = {{0, 0, NULL}}; */ -static known_sid_users everyone_users[] = {{ 0, SID_NAME_WKN_GRP, "Everyone" }, {0, 0, NULL}}; -static known_sid_users creator_owner_users[] = {{ 0, SID_NAME_ALIAS, "Creator Owner" }, {0, 0, NULL}}; +static known_sid_users everyone_users[] = { + { 0, SID_NAME_WKN_GRP, "Everyone" }, + {0, (enum SID_NAME_USE)0, NULL}}; +static known_sid_users creator_owner_users[] = { + { 0, SID_NAME_ALIAS, "Creator Owner" }, + {0, (enum SID_NAME_USE)0, NULL}}; static known_sid_users nt_authority_users[] = { { 1, SID_NAME_ALIAS, "Dialup" }, { 2, SID_NAME_ALIAS, "Network"}, @@ -64,7 +68,7 @@ static known_sid_users nt_authority_users[] = { { 9, SID_NAME_ALIAS, "ServerLogon"}, { 11, SID_NAME_ALIAS, "Authenticated Users"}, { 18, SID_NAME_ALIAS, "SYSTEM"}, - { 0, 0, NULL}}; + { 0, (enum SID_NAME_USE)0, NULL}}; static struct sid_name_map_info { diff --git a/source/lib/util_unistr.c b/source/lib/util_unistr.c index 93f5490ffcd..3282761ff8a 100644 --- a/source/lib/util_unistr.c +++ b/source/lib/util_unistr.c @@ -945,8 +945,8 @@ int strcmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2) return c1 - c2; if (c1 == 0) - return 0; - } + break; + } return 0; } @@ -966,9 +966,9 @@ int strncmp_w(const smb_ucs2_t *s1, const smb_ucs2_t *s2, size_t len) return c1 - c2; if (c1 == 0) - return 0; + break; - } + } return 0; } |