diff options
Diffstat (limited to 'source3/smbd')
| -rw-r--r-- | source3/smbd/notify.c | 2 | ||||
| -rw-r--r-- | source3/smbd/uid.c | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/source3/smbd/notify.c b/source3/smbd/notify.c index 55009ce0b1..ffdf1c22e7 100644 --- a/source3/smbd/notify.c +++ b/source3/smbd/notify.c @@ -169,7 +169,7 @@ void change_notify_reply(connection_struct *conn, return; } - prs_init(&ps, 0, NULL, MARSHALL); + prs_init_empty(&ps, NULL, MARSHALL); if (!notify_marshall_changes(notify_buf->num_changes, max_param, notify_buf->changes, &ps)) { diff --git a/source3/smbd/uid.c b/source3/smbd/uid.c index dceea450e6..1a3b7383c9 100644 --- a/source3/smbd/uid.c +++ b/source3/smbd/uid.c @@ -387,7 +387,12 @@ static void pop_conn_ctx(void) void become_root(void) { - push_sec_ctx(); + /* + * no good way to handle push_sec_ctx() failing without changing + * the prototype of become_root() + */ + if (!push_sec_ctx()) + return; push_conn_ctx(); set_root_sec_ctx(); } |