From: Andreas Schneider Date: Fri, 2 Nov 2018 17:56:29 +0000 (+0100) Subject: s3:winbind: Log client process name X-Git-Tag: tdb-1.3.17~809 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d26caa27e1cf286475a0d09621cc38d2b4e4335d;p=thirdparty%2Fsamba.git s3:winbind: Log client process name Signed-off-by: Andreas Schneider Reviewed-by: Jeremy Allison --- diff --git a/source3/winbindd/winbindd_getdcname.c b/source3/winbindd/winbindd_getdcname.c index c8213ae4880..f6b62757527 100644 --- a/source3/winbindd/winbindd_getdcname.c +++ b/source3/winbindd/winbindd_getdcname.c @@ -43,8 +43,10 @@ struct tevent_req *winbindd_getdcname_send(TALLOC_CTX *mem_ctx, request->domain_name[sizeof(request->domain_name)-1] = '\0'; - DEBUG(3, ("[%5lu]: getdcname for %s\n", (unsigned long)cli->pid, - request->domain_name)); + DBG_NOTICE("[%s (%u)] getdcname for %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->domain_name); subreq = wb_dsgetdcname_send(state, ev, request->domain_name, NULL, NULL, 0); diff --git a/source3/winbindd/winbindd_getgrent.c b/source3/winbindd/winbindd_getgrent.c index 15a35f7044e..b78d1f5b465 100644 --- a/source3/winbindd/winbindd_getgrent.c +++ b/source3/winbindd/winbindd_getgrent.c @@ -48,7 +48,9 @@ struct tevent_req *winbindd_getgrent_send(TALLOC_CTX *mem_ctx, state->num_groups = 0; state->cli = cli; - DEBUG(3, ("[%5lu]: getgrent\n", (unsigned long)cli->pid)); + DBG_NOTICE("[%s (%u)] getgrent\n", + cli->client_name, + (unsigned int)cli->pid); if (cli->grent_state == NULL) { tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES); diff --git a/source3/winbindd/winbindd_getgrgid.c b/source3/winbindd/winbindd_getgrgid.c index 640ebfa4969..49a24dee7a4 100644 --- a/source3/winbindd/winbindd_getgrgid.c +++ b/source3/winbindd/winbindd_getgrgid.c @@ -49,7 +49,10 @@ struct tevent_req *winbindd_getgrgid_send(TALLOC_CTX *mem_ctx, } state->ev = ev; - DEBUG(3, ("getgrgid %d\n", (int)request->data.gid)); + DBG_NOTICE("[%s (%u)] getgrgid %d\n", + cli->client_name, + (unsigned int)cli->pid, + (int)request->data.gid); state->xid = (struct unixid) { .id = request->data.uid, .type = ID_TYPE_GID }; diff --git a/source3/winbindd/winbindd_getgrnam.c b/source3/winbindd/winbindd_getgrnam.c index 37c205ddba4..db53848055a 100644 --- a/source3/winbindd/winbindd_getgrnam.c +++ b/source3/winbindd/winbindd_getgrnam.c @@ -54,7 +54,10 @@ struct tevent_req *winbindd_getgrnam_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.groupname[sizeof(request->data.groupname)-1]='\0'; - DEBUG(3, ("getgrnam %s\n", request->data.groupname)); + DBG_NOTICE("[%s (%u)] getgrnam %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.groupname); nt_status = normalize_name_unmap(state, request->data.groupname, &tmp); /* If we didn't map anything in the above call, just reset the diff --git a/source3/winbindd/winbindd_getgroups.c b/source3/winbindd/winbindd_getgroups.c index f7f2df5f7b1..16c06395d70 100644 --- a/source3/winbindd/winbindd_getgroups.c +++ b/source3/winbindd/winbindd_getgroups.c @@ -59,7 +59,10 @@ struct tevent_req *winbindd_getgroups_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.username[sizeof(request->data.username)-1]='\0'; - DEBUG(3, ("getgroups %s\n", request->data.username)); + DBG_NOTICE("[%s (%u)] getgroups %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.username); domuser = request->data.username; diff --git a/source3/winbindd/winbindd_getpwent.c b/source3/winbindd/winbindd_getpwent.c index 9e5190a3c60..030a013c160 100644 --- a/source3/winbindd/winbindd_getpwent.c +++ b/source3/winbindd/winbindd_getpwent.c @@ -47,7 +47,9 @@ struct tevent_req *winbindd_getpwent_send(TALLOC_CTX *mem_ctx, state->num_users = 0; state->cli = cli; - DEBUG(3, ("[%5lu]: getpwent\n", (unsigned long)cli->pid)); + DBG_NOTICE("[%s (%u)] getpwent\n", + cli->client_name, + (unsigned int)cli->pid); if (cli->pwent_state == NULL) { tevent_req_nterror(req, NT_STATUS_NO_MORE_ENTRIES); diff --git a/source3/winbindd/winbindd_getpwnam.c b/source3/winbindd/winbindd_getpwnam.c index 8da66c25141..63274cab5a0 100644 --- a/source3/winbindd/winbindd_getpwnam.c +++ b/source3/winbindd/winbindd_getpwnam.c @@ -55,7 +55,10 @@ struct tevent_req *winbindd_getpwnam_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.username[sizeof(request->data.username)-1]='\0'; - DEBUG(3, ("getpwnam %s\n", request->data.username)); + DBG_NOTICE("[%s (%u)] getpwnam %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.username); domuser = request->data.username; diff --git a/source3/winbindd/winbindd_getpwsid.c b/source3/winbindd/winbindd_getpwsid.c index 52481700756..f12d5296004 100644 --- a/source3/winbindd/winbindd_getpwsid.c +++ b/source3/winbindd/winbindd_getpwsid.c @@ -45,7 +45,10 @@ struct tevent_req *winbindd_getpwsid_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.sid[sizeof(request->data.sid)-1]='\0'; - DEBUG(3, ("getpwsid %s\n", request->data.sid)); + DBG_NOTICE("[%s (%u)] getpwsid %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.sid); if (!string_to_sid(&state->sid, request->data.sid)) { DEBUG(1, ("Could not get convert sid %s from string\n", diff --git a/source3/winbindd/winbindd_getpwuid.c b/source3/winbindd/winbindd_getpwuid.c index d7a1f4de5e5..319f2f71ad9 100644 --- a/source3/winbindd/winbindd_getpwuid.c +++ b/source3/winbindd/winbindd_getpwuid.c @@ -46,7 +46,10 @@ struct tevent_req *winbindd_getpwuid_send(TALLOC_CTX *mem_ctx, } state->ev = ev; - DEBUG(3, ("getpwuid %d\n", (int)request->data.uid)); + DBG_NOTICE("[%s (%u)] getpwuid %d\n", + cli->client_name, + (unsigned int)cli->pid, + (int)request->data.uid); state->xid = (struct unixid) { .id = request->data.uid, .type = ID_TYPE_UID }; diff --git a/source3/winbindd/winbindd_getsidaliases.c b/source3/winbindd/winbindd_getsidaliases.c index e40a51dbd6d..291e32f7996 100644 --- a/source3/winbindd/winbindd_getsidaliases.c +++ b/source3/winbindd/winbindd_getsidaliases.c @@ -49,7 +49,10 @@ struct tevent_req *winbindd_getsidaliases_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.sid[sizeof(request->data.sid)-1]='\0'; - DEBUG(3, ("getsidaliases %s\n", request->data.sid)); + DBG_NOTICE("[%s (%u)] getsidaliases %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.sid); if (!string_to_sid(&state->sid, request->data.sid)) { DEBUG(1, ("Could not get convert sid %s from string\n", diff --git a/source3/winbindd/winbindd_getuserdomgroups.c b/source3/winbindd/winbindd_getuserdomgroups.c index 24ec1ddc019..df90a87c7a2 100644 --- a/source3/winbindd/winbindd_getuserdomgroups.c +++ b/source3/winbindd/winbindd_getuserdomgroups.c @@ -46,7 +46,10 @@ struct tevent_req *winbindd_getuserdomgroups_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.sid[sizeof(request->data.sid)-1]='\0'; - DEBUG(3, ("getuserdomgroups %s\n", request->data.sid)); + DBG_NOTICE("[%s (%u)] getuserdomgroups %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.sid); if (!string_to_sid(&state->sid, request->data.sid)) { DEBUG(1, ("Could not get convert sid %s from string\n", diff --git a/source3/winbindd/winbindd_getusersids.c b/source3/winbindd/winbindd_getusersids.c index d6995c4390a..024bad2b9e5 100644 --- a/source3/winbindd/winbindd_getusersids.c +++ b/source3/winbindd/winbindd_getusersids.c @@ -46,7 +46,10 @@ struct tevent_req *winbindd_getusersids_send(TALLOC_CTX *mem_ctx, /* Ensure null termination */ request->data.sid[sizeof(request->data.sid)-1]='\0'; - DEBUG(3, ("getusersids %s\n", request->data.sid)); + DBG_NOTICE("[%s (%u)] getusersids %s\n", + cli->client_name, + (unsigned int)cli->pid, + request->data.sid); if (!string_to_sid(&state->sid, request->data.sid)) { DEBUG(1, ("Could not get convert sid %s from string\n",