[SCM] Samba Shared Repository - branch master updated
Andreas Schneider
asn at samba.org
Fri Jul 15 15:22:01 UTC 2022
The branch, master has been updated
via b17cae66e75 s3:winbind: Change max_users, num_users from int to uint32_t in winbindd_getpwent_state
via 0fb98133e2e s3:winbind: Change num_gids from int to uint32_t in winbindd_getgroups_state
via cf33679d787 s3:winbind: Change max_groups, num_groups from int to uint32_t in getpwent_state
via 2ef11c4dde9 s3:winbind: Change num_groups, next_group from int to uint32_t in wb_group_members.c
via 69a9b7a5dba s3:winbind: Change num_groups from int to uint32_t in wb_query_group_list_recv()
via 84ab676c361 s3:winbind: Change num_received, num_domains from int to uint32_t in winbindd_list_groups_state
via 72eacda263b s3:winbind: Change num_sids from int to uint32_t in wb_lookupusergroups_recv()
via 51250c6142c s3:winbind: Change num_sids from int to uint32_t in wb_lookupuseraliases_send()
via ef5090b3b61 s3:winbind: Change num_sids from int to uint32_t in wb_gettoken_recv()
via d3b4940379e s3:winbind: Fix trailing whitespace in winbindd.h
via f72f039027c s3:winbind: Improve logging in wb_sids2xids.c
via 5804a4c0bd0 s3:winbind: Improve logging in wb_query_user_list.c
via 7d751d76b21 s3:winbind: Improve logging in wb_queryuser.c
via bd1447cab2a s3:winbind: Improve logging in wb_query_group_list.c
via 68b8b98cba8 s3:winbind: Improve logging in wb_next_pwent.c
via 9435a8bf9ad s3:winbind: Improve logging in wb_next_grent.c
via 513d9c34ce4 s3:winbind: Improve logging in wb_lookupusergroups.c
via b8f3dec0fcc s3:winbind: Improve logging in wb_lookupuseraliases.c
via 7b9bf8429ee s3:winbind: Improve logging in wb_lookupsids.c
via 6b4cbb3dada s3:winbind: Improve logging in wb_lookupsid.c
via 5c0d8054cd4 s3:winbind: Improve logging in wb_lookupname.c
via bdd2ce0399e s3:winbind: Improve logging in wb_group_members.c
via 42ada8ed1cb s3:winbind: Improve logging in wb_gettoken.c
via 35df8fd8261 s3:winbind: Improve logging in wb_getpwsid.c
via bb801a73324 s3:winbind: Improve logging in wb_getgrsid.c
via 08e80f87631 s3:winbind: Improve logging in wb_dsgetdcname.c
via d21d69e8746 s3:winbind: Improve logging in samlogon_cache.c
via f52eeb89f40 s3:winbind: Improve logging in winbindd_xids_to_sids.c
via 0f4c7404d65 s3:winbind: Improve logging in winbindd_wins_byname.c
via 7a9bec6a67b s3:winbind: Improve logging in winbindd_wins_byip.c
via 0f031024b1d s3:winbind: Improve logging in winbindd_sids_to_xids.c
via 3c1d91cd5b1 s3:winbind: Improve logging in winbindd_setpwent.c
via 5eaabe0404c s3:winbind: Improve logging in winbindd_setgrent.c
via 53d9cf7692e s3:winbind: Improve logging in winbindd_pam_logoff.c
via 4f63a3b731a s3:winbind: Improve logging in winbindd_pam_auth.c
via fff33f71bb4 s3:winbind: Improve logging in winbindd_lookupname.c
via 6620a74ab19 s3:winbind: Improve logging in winbindd_list_users.c
via 4d081c77054 s3:winbind: Improve logging in winbindd_list_groups.c
via 2fbc57cfd15 s3:winbind: Improve logging in winbindd_getuserdomgroups.c
via a80a8ded3f4 s3:winbind: Improve logging in winbindd_getsidaliases.c
via 15529612491 s3:winbind: Improve logging in winbindd_getpwuid.c
via 980f8092c6d s3:winbind: Improve logging in winbindd_getpwsid.c
via 1074e74d793 s3:winbind: Improve logging in winbindd_getpwnam.c
via 5e7039a8521 s3:winbind: Improve logging in winbindd_getpwent.c
via 09807998671 s3:winbind: Improve logging in winbindd_getgroups.c
via 2ec7ccabb34 s3:winbind: Improve logging in winbindd_getgrnam.c
via 9c41992d9dc s3:winbind: Improve logging in winbindd_getgrgid.c
via ac8f35d6b49 s3:winbind: Improve logging in winbindd_getgrent.c
via a0666eb64fb s3:winbind: Improve logging in winbindd_getdcname.c
via 2fed5d20815 s3:winbind: Improve logging in winbindd_endpwent.c
via 6cb508ab3d0 s3:winbind: Improve logging in winbindd_endgrent.c
via 25d38cc6ecf s3:winbind: Improve logging in winbindd_dsgetdcname.c
via f8e372e1e24 s3:winbind: Improve logging in winbindd_getusersids.c
via 2b5c86118d4 s3:winbind: Move up some code in winbindd_getusersids.c
via 07dd2c71863 s3:winbind: Improve logging in winbindd_group.c
via 14f4ba19714 s3:winbind: Improve logging in wb_xids2sids.c
via 1852160ee32 s3:winbind: Improve logging in winbindd.c
via feb04d99716 s3:winbind: Fix trailing whitespaces in winbindd_group.c
via d3805d53550 librpc:ndr: Update ndr_print_debug() to the new ndr ABI
via b1f8f5c4466 s4:lib: Fix trailing whitespaces in tools/regshell.c
via 48cb47f5b04 s3:passdb: Fix trailing whitespaces in machine_account_secrets.c
via 7b9f87b877b librpc:ndr: Update ndr_print_debug() and add macro NDR_PRINT_DEBUG_LEVEL
via f0e0a953200 debug: Add DEBUGLF macro with explicit location and function parameters.
via 8e2d05879eb debug: Fix whitespace and a typo in debug.h
from bbc5abfa6d2 selftest: Do not skip working tests
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit b17cae66e7555be7c34f45fa9213d55546181a1e
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:44 2022 +0200
s3:winbind: Change max_users, num_users from int to uint32_t in winbindd_getpwent_state
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
Autobuild-User(master): Andreas Schneider <asn at cryptomilk.org>
Autobuild-Date(master): Fri Jul 15 15:21:23 UTC 2022 on sn-devel-184
commit 0fb98133e2ee32b2cd4c0badd9c94f559ef90e4d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:44 2022 +0200
s3:winbind: Change num_gids from int to uint32_t in winbindd_getgroups_state
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit cf33679d787b3848d1f4e34ca709bf48d2ce9a6c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:44 2022 +0200
s3:winbind: Change max_groups, num_groups from int to uint32_t in getpwent_state
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2ef11c4dde9d7cb21c039804000d51f079166662
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:43 2022 +0200
s3:winbind: Change num_groups, next_group from int to uint32_t in wb_group_members.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 69a9b7a5dbaeb816ee32496f58b9ff2517f6ab86
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:44 2022 +0200
s3:winbind: Change num_groups from int to uint32_t in wb_query_group_list_recv()
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 84ab676c3617791a1122efd963d593856f714f49
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:19:44 2022 +0200
s3:winbind: Change num_received, num_domains from int to uint32_t in winbindd_list_groups_state
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 72eacda263b0a3b896b8eef46a00a9e6ddb8564d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Mon Jul 11 22:41:46 2022 +0200
s3:winbind: Change num_sids from int to uint32_t in wb_lookupusergroups_recv()
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 51250c6142c47def3f835f124e7416b0b375b9ef
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Mon Jul 11 22:39:06 2022 +0200
s3:winbind: Change num_sids from int to uint32_t in wb_lookupuseraliases_send()
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ef5090b3b6181b77e19be9637756419bf3dd54aa
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Mon Jul 11 21:40:08 2022 +0200
s3:winbind: Change num_sids from int to uint32_t in wb_gettoken_recv()
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d3b4940379e9b44340ecf754c575452877dcbcc6
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jul 14 13:44:16 2022 +0200
s3:winbind: Fix trailing whitespace in winbindd.h
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f72f039027c852ab058755d242837300a774bf24
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jun 7 19:42:37 2022 +0200
s3:winbind: Improve logging in wb_sids2xids.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5804a4c0bd032a7ba8d86fb3db46e63988d0b1ab
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:31:03 2022 +0200
s3:winbind: Improve logging in wb_query_user_list.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7d751d76b217edd4a5242bf6abc242303c297da4
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jun 7 19:35:16 2022 +0200
s3:winbind: Improve logging in wb_queryuser.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bd1447cab2af87375b9a489a951dafd37c4b4759
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:41:21 2022 +0200
s3:winbind: Improve logging in wb_query_group_list.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 68b8b98cba83878de70252b0886d299050aa1c7c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Jun 22 20:18:35 2022 +0200
s3:winbind: Improve logging in wb_next_pwent.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 9435a8bf9ad1d3e146c2486ab58a1d0b5369a4b9
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:10:39 2022 +0200
s3:winbind: Improve logging in wb_next_grent.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 513d9c34ce4a2e4caa843bac6e3f8ed0cc97f935
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Sun Jun 19 20:48:31 2022 +0200
s3:winbind: Improve logging in wb_lookupusergroups.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b8f3dec0fccefff67d03ae4972bddc2fb4047a48
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jun 7 19:36:59 2022 +0200
s3:winbind: Improve logging in wb_lookupuseraliases.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7b9bf8429ee12359ebb280e9bacc8a83518e18a3
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Sat Jun 11 17:45:15 2022 +0200
s3:winbind: Improve logging in wb_lookupsids.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 6b4cbb3dadae069d9292b5dfde390c48e068f53c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jun 7 19:36:16 2022 +0200
s3:winbind: Improve logging in wb_lookupsid.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5c0d8054cd44d43745bb9a2fb03226a056983810
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Jun 22 23:39:52 2022 +0200
s3:winbind: Improve logging in wb_lookupname.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bdd2ce0399e3bf091d884e9aebb7763a0457e667
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jun 23 10:40:53 2022 +0200
s3:winbind: Improve logging in wb_group_members.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 42ada8ed1cbcf9fc73edd6baefd97ed3a61df21f
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jun 7 19:33:57 2022 +0200
s3:winbind: Improve logging in wb_gettoken.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 35df8fd8261d3556a153fa5c7ef5a83998c1e94d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Mon Jun 20 15:05:21 2022 +0200
s3:winbind: Improve logging in wb_getpwsid.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit bb801a73324d1de1941fb971cc67d253e2a74ef8
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:04:46 2022 +0200
s3:winbind: Improve logging in wb_getgrsid.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 08e80f8763183ff8a7812001fbc31fce57ae275a
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:05:09 2022 +0200
s3:winbind: Improve logging in wb_dsgetdcname.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d21d69e8746be7378e9f0f6c63556f3b958ee310
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Sat Jun 11 17:44:30 2022 +0200
s3:winbind: Improve logging in samlogon_cache.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f52eeb89f4006672f90bbf26ede6c23eb09c3139
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 12:12:30 2022 +0200
s3:winbind: Improve logging in winbindd_xids_to_sids.c
Test scenario in ad_dc:local test environment:
bin/wbinfo --unix-ids-to-sids=u100000
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0f4c7404d65746f924086aafc0f16bd9a718a500
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 13:01:23 2022 +0200
s3:winbind: Improve logging in winbindd_wins_byname.c
Test scenario:
$ bin/wbinfo --WINS-by-name=ADDC
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7a9bec6a67ba242baaa2870e150ccd4ddb0f313e
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 13:07:42 2022 +0200
s3:winbind: Improve logging in winbindd_wins_byip.c
Test scenario:
$ bin/wbinfo --WINS-by-ip=10.53.57.30
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 0f031024b1d133aea0fa62f9badd16b84fd3182c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 13:14:27 2022 +0200
s3:winbind: Improve logging in winbindd_sids_to_xids.c
Test scenario:
bin/wbinfo --sid-to-uid=S-1-5-21-1961314572-195468382-2567644205-1107
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 3c1d91cd5b1afb89a0b10a3fbea55aab80386f8c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 10:44:54 2022 +0200
s3:winbind: Improve logging in winbindd_setpwent.c
Test scenario:
$ getent passwd
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5eaabe0404ca70a247aaba1dbaacd190811a30f1
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 10:43:33 2022 +0200
s3:winbind: Improve logging in winbindd_setgrent.c
Test scenario:
id ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 53d9cf7692e68bfc7db0b00703e2c8a9e58a439c
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 14:51:07 2022 +0200
s3:winbind: Improve logging in winbindd_pam_logoff.c
Test scenario:
$ bin/wbinfo --logoff
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4f63a3b731a8deaac6d98d13f3445212dc10d7b5
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 14:29:35 2022 +0200
s3:winbind: Improve logging in winbindd_pam_auth.c
Test scenario:
$ bin/wbinfo --pam-logon=ADDOMAIN/alice%Secret007
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit fff33f71bb4045ac445288562847504a59934bfb
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 13:32:52 2022 +0200
s3:winbind: Improve logging in winbindd_lookupname.c
Test scenario:
bin/wbinfo --name-to-sid=ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 6620a74ab19ea3f49bfbaff5ce0d121923bc82ad
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 11:10:24 2022 +0200
s3:winbind: Improve logging in winbindd_list_users.c
Test scenario:
$ bin/wbinfo -u
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 4d081c77054c2da379237bd77f54baf9a489e453
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 12:25:16 2022 +0200
s3:winbind: Improve logging in winbindd_list_groups.c
Test scenario:
$ bin/wbinfo -g
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2fbc57cfd1581142cc84f4e959010cfc0c96672a
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 15:06:04 2021 +0200
s3:winbind: Improve logging in winbindd_getuserdomgroups.c
Test scenario:
$ bin/wbinfo --user-domgroups `bin/wbinfo -n ADDOMAIN/alice | awk '{print $1}'`
S-1-5-21-2260029349-2102976898-3003119-1107
S-1-5-21-2260029349-2102976898-3003119-513
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a80a8ded3f4c2d7ec313d933395dfb963d9c47c8
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 14:51:02 2021 +0200
s3:winbind: Improve logging in winbindd_getsidaliases.c
Test scenario:
$ bin/wbinfo --sid-aliases S-1-5-21-4248687961-4152985382-2800071106-1107
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 15529612491d5d65e2a3e4c895eaf7c3f5bc8187
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 14:38:37 2021 +0200
s3:winbind: Improve logging in winbindd_getpwuid.c
Test scenario:
$ bin/wbinfo --uid-info 2001107
or
$ bin/wbinfo --uid-info 100000
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 980f8092c6d67375de457a553148730e33ec616d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 14:21:23 2021 +0200
s3:winbind: Improve logging in winbindd_getpwsid.c
Test scenario:
$ bin/wbinfo --name-to-sid ADDOMAIN/alice
S-1-5-21-4248687961-4152985382-2800071106-1107 SID_USER (1)
$ bin/wbinfo --user-sidinfo S-1-5-21-4248687961-4152985382-2800071106-1107
ADDOMAIN/alice:*:2001107:2000513::/home/ADDOMAIN/alice:/bin/false
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 1074e74d793d06e2654d7e3a112b63bbde358acb
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Aug 4 18:12:03 2021 +0200
s3:winbind: Improve logging in winbindd_getpwnam.c
Test scenario:
id ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 5e7039a85215d34bdd38accc9d09dfb14499b91e
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 11:02:53 2021 +0200
s3:winbind: Improve logging in winbindd_getpwent.c
Test scenario:
$ getent passwd
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 098079986715c85d7f710f63178624e2a7d2909b
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 10:44:27 2021 +0200
s3:winbind: Improve logging in winbindd_getgroups.c
Test scenario:
bin/wbinfo --user-groups 'ADDOMAIN/alice'
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2ec7ccabb3400b70ab3d039931787f8d8589af1a
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Aug 4 18:41:21 2021 +0200
s3:winbind: Improve logging in winbindd_getgrnam.c
Test scenario:
bin/wbinfo --group-info 'ADDOMAIN/domain users'
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 9c41992d9dc681b4d29ef8ed2cc72e1a1f6762a9
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Aug 4 18:36:51 2021 +0200
s3:winbind: Improve logging in winbindd_getgrgid.c
Test scenario:
id ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit ac8f35d6b49b2b2bfba476827818929fe7307c0d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Aug 4 18:29:11 2021 +0200
s3:winbind: Improve logging in winbindd_getgrent.c
Test scenario:
id ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit a0666eb64fbfce3ad856630cb87e0343a319e7ae
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Aug 4 18:16:47 2021 +0200
s3:winbind: Improve logging in winbindd_getdcname.c
Test scenario:
bin/wbinfo --getdcname=ADDOMAIN
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2fed5d20815b51aa1594a06af8bdf1bb1354da9b
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 10:47:10 2022 +0200
s3:winbind: Improve logging in winbindd_endpwent.c
Test scenario:
$ getent passwd
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 6cb508ab3d0d316d3adafe6d5fd4f1eef3198793
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 10:40:11 2022 +0200
s3:winbind: Improve logging in winbindd_endgrent.c
Test scenario:
id ADDOMAIN/alice
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 25d38cc6ecfb3086b6ace2c4f35de954f9c696f4
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 12:35:59 2022 +0200
s3:winbind: Improve logging in winbindd_dsgetdcname.c
Test scenario:
$ bin/wbinfo --dsgetdcname=ADDOMAIN
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f8e372e1e2477d7fea5335d43a8b44fe9bdd5d8d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 15:17:57 2021 +0200
s3:winbind: Improve logging in winbindd_getusersids.c
Test scenario:
$ bin/wbinfo --user-sids `bin/wbinfo -n ADDOMAIN/alice | awk '{print $1}'`
S-1-5-21-2018381343-4210792308-1157936888-1107
S-1-5-21-2018381343-4210792308-1157936888-513
S-1-5-32-545
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 2b5c86118d4c0bba23a0db61413fa288425cc8ba
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Aug 5 15:17:57 2021 +0200
s3:winbind: Move up some code in winbindd_getusersids.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 07dd2c718631cd6a4180010aaad2103bda477894
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jun 23 12:42:51 2022 +0200
s3:winbind: Improve logging in winbindd_group.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 14f4ba19714fde34454ec10d46ef1ba8adcdac2b
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 15:27:29 2022 +0200
s3:winbind: Improve logging in wb_xids2sids.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 1852160ee326d28b11d22d0c75989289f8af3c0e
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jun 24 12:45:33 2022 +0200
s3:winbind: Improve logging in winbindd.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit feb04d99716a6f63ff04b8348103b693b77f9c23
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Thu Jun 23 12:42:09 2022 +0200
s3:winbind: Fix trailing whitespaces in winbindd_group.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit d3805d535507936051c7eeb30d56411fe1bb7cea
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jul 8 16:48:09 2022 +0200
librpc:ndr: Update ndr_print_debug() to the new ndr ABI
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit b1f8f5c446647253319d66c6d9dd012e38e0c7eb
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jul 8 16:52:21 2022 +0200
s4:lib: Fix trailing whitespaces in tools/regshell.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 48cb47f5b04d33a11362c12c225c2e9235677296
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Fri Jul 8 16:50:38 2022 +0200
s3:passdb: Fix trailing whitespaces in machine_account_secrets.c
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 7b9f87b877bd385e8cec893cd282d4b3fc00206d
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Wed Jun 22 11:13:34 2022 +0200
librpc:ndr: Update ndr_print_debug() and add macro NDR_PRINT_DEBUG_LEVEL
Bumping the ABI to 3.0.0
This is enhancement of NDR_PRINT_DEBUG macro with following new features:
* debug level can be specified (NDR_PRINT_DEBUG always uses level 1)
* the trace header shows the location and function of the caller
instead of function 'ndr_print_debug', which is not really useful.
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit f0e0a95320019ce2b2eac6350d95ec1fb3b2d563
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Sun Jun 19 15:40:37 2022 +0200
debug: Add DEBUGLF macro with explicit location and function parameters.
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
commit 8e2d05879eb701dad58d4f336c734c445527bed4
Author: Pavel Filipenský <pfilipen at redhat.com>
Date: Tue Jul 12 10:36:30 2022 +0200
debug: Fix whitespace and a typo in debug.h
Signed-off-by: Pavel Filipenský <pfilipen at redhat.com>
Reviewed-by: Andreas Schneider <asn at samba.org>
-----------------------------------------------------------------------
Summary of changes:
lib/util/debug.h | 23 +++++++-
librpc/ABI/{ndr-2.0.0.sigs => ndr-3.0.0.sigs} | 2 +-
librpc/ndr/libndr.h | 23 +++++++-
librpc/ndr/ndr.c | 12 +++-
librpc/wscript_build | 2 +-
source3/libsmb/samlogon_cache.c | 13 ++---
source3/passdb/machine_account_secrets.c | 7 +--
source3/winbindd/wb_dsgetdcname.c | 6 ++
source3/winbindd/wb_getgrsid.c | 6 ++
source3/winbindd/wb_getpwsid.c | 6 +-
source3/winbindd/wb_gettoken.c | 46 ++++++++++++---
source3/winbindd/wb_group_members.c | 41 +++++++++-----
source3/winbindd/wb_lookupname.c | 11 +++-
source3/winbindd/wb_lookupsid.c | 19 ++++++-
source3/winbindd/wb_lookupsids.c | 19 ++++++-
source3/winbindd/wb_lookupuseraliases.c | 22 +++++++-
source3/winbindd/wb_lookupusergroups.c | 15 ++++-
source3/winbindd/wb_next_grent.c | 11 +++-
source3/winbindd/wb_next_pwent.c | 13 ++++-
source3/winbindd/wb_query_group_list.c | 9 +--
source3/winbindd/wb_query_user_list.c | 12 +++-
source3/winbindd/wb_queryuser.c | 62 ++++++++++++++++++++-
source3/winbindd/wb_sids2xids.c | 80 +++++++++++++++++++++++----
source3/winbindd/wb_xids2sids.c | 30 +++++++++-
source3/winbindd/winbindd.c | 24 ++++----
source3/winbindd/winbindd.h | 6 +-
source3/winbindd/winbindd_dsgetdcname.c | 13 +++--
source3/winbindd/winbindd_endgrent.c | 5 ++
source3/winbindd/winbindd_endpwent.c | 6 ++
source3/winbindd/winbindd_getdcname.c | 15 +++--
source3/winbindd/winbindd_getgrent.c | 34 +++++++-----
source3/winbindd/winbindd_getgrgid.c | 20 ++++---
source3/winbindd/winbindd_getgrnam.c | 13 +++--
source3/winbindd/winbindd_getgroups.c | 46 +++++++++------
source3/winbindd/winbindd_getpwent.c | 44 +++++++++++----
source3/winbindd/winbindd_getpwnam.c | 28 +++++++---
source3/winbindd/winbindd_getpwsid.c | 31 +++++++----
source3/winbindd/winbindd_getpwuid.c | 28 ++++++++--
source3/winbindd/winbindd_getsidaliases.c | 40 +++++++-------
source3/winbindd/winbindd_getuserdomgroups.c | 22 +++++---
source3/winbindd/winbindd_getusersids.c | 34 +++++++-----
source3/winbindd/winbindd_group.c | 14 +++--
source3/winbindd/winbindd_list_groups.c | 33 +++++++----
source3/winbindd/winbindd_list_users.c | 15 ++++-
source3/winbindd/winbindd_lookupname.c | 13 +++--
source3/winbindd/winbindd_pam_auth.c | 14 +++--
source3/winbindd/winbindd_pam_logoff.c | 18 +++---
source3/winbindd/winbindd_proto.h | 8 +--
source3/winbindd/winbindd_setgrent.c | 7 +++
source3/winbindd/winbindd_setpwent.c | 7 +++
source3/winbindd/winbindd_sids_to_xids.c | 13 +++--
source3/winbindd/winbindd_wins_byip.c | 16 ++++--
source3/winbindd/winbindd_wins_byname.c | 12 +++-
source3/winbindd/winbindd_xids_to_sids.c | 21 ++++---
source4/lib/registry/tools/regshell.c | 9 ++-
source4/torture/drs/rpc/dssync.c | 2 +-
source4/torture/ndr/ntprinting.c | 4 +-
source4/torture/rpc/samsync.c | 4 +-
source4/torture/smb2/ioctl.c | 9 ++-
59 files changed, 816 insertions(+), 302 deletions(-)
copy librpc/ABI/{ndr-2.0.0.sigs => ndr-3.0.0.sigs} (99%)
Changeset truncated at 500 lines:
diff --git a/lib/util/debug.h b/lib/util/debug.h
index 9f902863527..f58bb005145 100644
--- a/lib/util/debug.h
+++ b/lib/util/debug.h
@@ -139,7 +139,7 @@ bool dbgsetclass(int level, int cls);
*
* Example: DEBUGC( DBGC_TDB, 2, ("Some text and a value %d.\n", value) );
*
- * DEBUGADD(), DEBUGADDC()
+ * DEBUGADD(), DEBUGADDC()
* Same as DEBUG() and DEBUGC() except the text is appended to the previous
* DEBUG(), DEBUGC(), DEBUGADD(), DEBUGADDC() with out another interviening
* header.
@@ -147,7 +147,7 @@ bool dbgsetclass(int level, int cls);
* Example: DEBUGADD( 2, ("Some text and a value %d.\n", value) );
* DEBUGADDC( DBGC_TDB, 2, ("Some text and a value %d.\n", value) );
*
- * Note: If the debug class has not be redeined (see above) then the optimizer
+ * Note: If the debug class has not be redefined (see above) then the optimizer
* will remove the extra conditional test.
*/
@@ -199,6 +199,25 @@ void debuglevel_set_class(size_t idx, int level);
&& (dbghdrclass( level, DBGC_CLASS, __location__, __FUNCTION__ )) \
&& (dbgtext body) )
+/**
+ * @brief DEBUGLF is same as DEBUG with explicit location and function arguments
+ *
+ * To be used when passing location and function of a caller appearig earlier in
+ * the call stack instead of some helper function.
+ *
+ * @code
+ * DEBUGLF( 2, ("Some text.\n"), "foo.c:1", "foo" );
+ * DEBUGLF( 5, ("Some text.\n"), location, function );
+ * @endcode
+ *
+ * @return void.
+ */
+#define DEBUGLF( level, body, location, function ) \
+ (void)( ((level) <= MAX_DEBUG_LEVEL) && \
+ unlikely(debuglevel_get_class(DBGC_CLASS) >= (level)) \
+ && (dbghdrclass( level, DBGC_CLASS, location, function )) \
+ && (dbgtext body) )
+
#define DEBUGC( dbgc_class, level, body ) \
(void)( ((level) <= MAX_DEBUG_LEVEL) && \
unlikely(debuglevel_get_class(dbgc_class) >= (level)) \
diff --git a/librpc/ABI/ndr-2.0.0.sigs b/librpc/ABI/ndr-3.0.0.sigs
similarity index 99%
copy from librpc/ABI/ndr-2.0.0.sigs
copy to librpc/ABI/ndr-3.0.0.sigs
index aefe5aae64b..d3f3eca26ae 100644
--- a/librpc/ABI/ndr-2.0.0.sigs
+++ b/librpc/ABI/ndr-3.0.0.sigs
@@ -42,7 +42,7 @@ ndr_print_array_uint8: void (struct ndr_print *, const char *, const uint8_t *,
ndr_print_bad_level: void (struct ndr_print *, const char *, uint16_t)
ndr_print_bitmap_flag: void (struct ndr_print *, size_t, const char *, uint32_t, uint32_t)
ndr_print_bool: void (struct ndr_print *, const char *, const bool)
-ndr_print_debug: void (ndr_print_fn_t, const char *, void *)
+ndr_print_debug: bool (int, ndr_print_fn_t, const char *, void *, const char *, const char *)
ndr_print_debug_helper: void (struct ndr_print *, const char *, ...)
ndr_print_debugc: void (int, ndr_print_fn_t, const char *, void *)
ndr_print_debugc_helper: void (struct ndr_print *, const char *, ...)
diff --git a/librpc/ndr/libndr.h b/librpc/ndr/libndr.h
index 8a0b072d800..98f8ff870d2 100644
--- a/librpc/ndr/libndr.h
+++ b/librpc/ndr/libndr.h
@@ -214,7 +214,7 @@ struct ndr_print {
#define LIBNDR_FLAG_NO_NDR_SIZE (1U<<31)
/* useful macro for debugging */
-#define NDR_PRINT_DEBUG(type, p) ndr_print_debug((ndr_print_fn_t)ndr_print_ ##type, #p, p)
+#define NDR_PRINT_DEBUG(type, p) (void)ndr_print_debug(1, (ndr_print_fn_t)ndr_print_ ##type, #p, p, __location__, __func__)
#define NDR_PRINT_DEBUGC(dbgc_class, type, p) ndr_print_debugc(dbgc_class, (ndr_print_fn_t)ndr_print_ ##type, #p, p)
#define NDR_PRINT_UNION_DEBUG(type, level, p) ndr_print_union_debug((ndr_print_fn_t)ndr_print_ ##type, #p, level, p)
#define NDR_PRINT_FUNCTION_DEBUG(type, flags, p) ndr_print_function_debug((ndr_print_function_t)ndr_print_ ##type, #type, flags, p)
@@ -222,6 +222,25 @@ struct ndr_print {
#define NDR_PRINT_OUT_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_OUT, p)
#define NDR_PRINT_IN_DEBUG(type, p) NDR_PRINT_FUNCTION_DEBUG(type, NDR_IN | NDR_SET_VALUES, p)
+/**
+ * @brief Prints NDR structure.
+ *
+ * Like NDR_PRINT_DEBUG, but takes a debug level parameter.
+ *
+ * @param[in] l The debug level.
+ * @param[in] type ndr_print_#type is the function that will be called.
+ * @param[in] p Pointer to the struct.
+ *
+ * @code
+ * NDR_PRINT_DEBUG_LEVEL(DBGLVL_DEBUG, wbint_userinfo, state->info);
+ * @endcode
+ *
+ * @return void.
+ */
+#define NDR_PRINT_DEBUG_LEVEL(l, type, p) \
+ (void) ( CHECK_DEBUGLVL(l) \
+ && ndr_print_debug(l, (ndr_print_fn_t)ndr_print_ ##type, #p, p, __location__, __func__) )
+
/* useful macro for debugging in strings */
#define NDR_PRINT_STRUCT_STRING(ctx, type, p) ndr_print_struct_string(ctx, (ndr_print_fn_t)ndr_print_ ##type, #p, p)
#define NDR_PRINT_UNION_STRING(ctx, type, level, p) ndr_print_union_string(ctx, (ndr_print_fn_t)ndr_print_ ##type, #p, level, p)
@@ -598,7 +617,7 @@ void ndr_print_debug_helper(struct ndr_print *ndr, const char *format, ...) PRIN
void ndr_print_debugc_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ndr_print_printf_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
void ndr_print_string_helper(struct ndr_print *ndr, const char *format, ...) PRINTF_ATTRIBUTE(2,3);
-void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr);
+bool ndr_print_debug(int level, ndr_print_fn_t fn, const char *name, void *ptr, const char *location, const char *function);
void ndr_print_debugc(int dbgc_class, ndr_print_fn_t fn, const char *name, void *ptr);
void ndr_print_union_debug(ndr_print_fn_t fn, const char *name, uint32_t level, void *ptr);
void ndr_print_function_debug(ndr_print_function_t fn, const char *name, int flags, void *ptr);
diff --git a/librpc/ndr/ndr.c b/librpc/ndr/ndr.c
index 031e02a22da..25765880d8b 100644
--- a/librpc/ndr/ndr.c
+++ b/librpc/ndr/ndr.c
@@ -428,14 +428,19 @@ _PUBLIC_ void ndr_print_debugc(int dbgc_class, ndr_print_fn_t fn, const char *na
/*
a useful helper function for printing idl structures via DEBUG()
*/
-_PUBLIC_ void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr)
+_PUBLIC_ bool ndr_print_debug(int level,
+ ndr_print_fn_t fn,
+ const char *name,
+ void *ptr,
+ const char *location,
+ const char *function)
{
struct ndr_print *ndr;
- DEBUG(1,(" "));
+ DEBUGLF(level, (" "), location, function);
ndr = talloc_zero(NULL, struct ndr_print);
- if (!ndr) return;
+ if (!ndr) return false;
ndr->print = ndr_print_debug_helper;
ndr->depth = 1;
ndr->flags = 0;
@@ -447,6 +452,7 @@ _PUBLIC_ void ndr_print_debug(ndr_print_fn_t fn, const char *name, void *ptr)
fn(ndr, name, ptr);
talloc_free(ndr);
+ return true;
}
/*
diff --git a/librpc/wscript_build b/librpc/wscript_build
index b82209b4299..cf9085c0884 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -654,7 +654,7 @@ bld.SAMBA_LIBRARY('ndr',
public_deps='samba-errors talloc samba-util util_str_hex',
public_headers='gen_ndr/misc.h gen_ndr/ndr_misc.h ndr/libndr.h:ndr.h',
header_path= [('*gen_ndr*', 'gen_ndr')],
- vnum='2.0.0',
+ vnum='3.0.0',
abi_directory='ABI',
abi_match='!ndr_table_* ndr_* GUID_* _ndr_pull_error* _ndr_push_error*',
)
diff --git a/source3/libsmb/samlogon_cache.c b/source3/libsmb/samlogon_cache.c
index a9ddaab1a41..ab81b4373a1 100644
--- a/source3/libsmb/samlogon_cache.c
+++ b/source3/libsmb/samlogon_cache.c
@@ -139,8 +139,8 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
}
if (!netsamlogon_cache_init()) {
- DEBUG(0,("netsamlogon_cache_store: cannot open %s for write!\n",
- NETSAMLOGON_TDB));
+ D_WARNING("netsamlogon_cache_store: cannot open %s for write!\n",
+ NETSAMLOGON_TDB);
goto fail;
}
@@ -155,7 +155,7 @@ bool netsamlogon_cache_store(const char *username, struct netr_SamInfo3 *info3)
ret = tdb_store_bystring(netsamlogon_tdb, keystr.buf, data, TDB_INSERT);
if ((ret == -1) && (tdb_error(netsamlogon_tdb) != TDB_ERR_EXISTS)) {
- DBG_WARNING("Could not store domain marker for %s: %s\n",
+ D_WARNING("Could not store domain marker for %s: %s\n",
keystr.buf, tdb_errorstr(netsamlogon_tdb));
goto fail;
}
@@ -253,6 +253,7 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const struct do
data = tdb_fetch_bystring( netsamlogon_tdb, keystr.buf );
if (!data.dptr) {
+ D_DEBUG("tdb fetch for %s is empty\n", keystr.buf);
return NULL;
}
@@ -268,15 +269,13 @@ struct netr_SamInfo3 *netsamlogon_cache_get(TALLOC_CTX *mem_ctx, const struct do
(ndr_pull_flags_fn_t)ndr_pull_netsamlogoncache_entry);
if (!NDR_ERR_CODE_IS_SUCCESS(ndr_err)) {
- DEBUG(0,("netsamlogon_cache_get: failed to pull entry from cache\n"));
+ D_WARNING("netsamlogon_cache_get: failed to pull entry from cache\n");
tdb_delete_bystring(netsamlogon_tdb, keystr.buf);
TALLOC_FREE(info3);
goto done;
}
- if (DEBUGLEVEL >= 10) {
- NDR_PRINT_DEBUG(netsamlogoncache_entry, &r);
- }
+ NDR_PRINT_DEBUG_LEVEL(DBGLVL_DEBUG, netsamlogoncache_entry, &r);
info3 = (struct netr_SamInfo3 *)talloc_memdup(mem_ctx, &r.info3,
sizeof(r.info3));
diff --git a/source3/passdb/machine_account_secrets.c b/source3/passdb/machine_account_secrets.c
index c10fda7f0c0..d404298502e 100644
--- a/source3/passdb/machine_account_secrets.c
+++ b/source3/passdb/machine_account_secrets.c
@@ -99,7 +99,7 @@ bool secrets_clear_domain_protection(const char *domain)
{
bool ret;
void *protection = secrets_fetch(protect_ids_keystr(domain), NULL);
-
+
if (protection) {
SAFE_FREE(protection);
ret = secrets_delete_entry(protect_ids_keystr(domain));
@@ -510,7 +510,7 @@ bool secrets_store_machine_pw_sync(const char *pass, const char *oldpass, const
}
} else {
SIVAL(&sec_channel_bytes, 0, secure_channel_type);
- ret = secrets_store(machine_sec_channel_type_keystr(domain),
+ ret = secrets_store(machine_sec_channel_type_keystr(domain),
&sec_channel_bytes, sizeof(sec_channel_bytes));
if (!ret) {
TALLOC_FREE(frame);
@@ -778,8 +778,7 @@ void secrets_debug_domain_info(int lvl, const struct secrets_domain_info1 *info1
sdib.info.info1 = discard_const_p(struct secrets_domain_info1, info1);
- ndr_print_debug((ndr_print_fn_t)ndr_print_secrets_domain_infoB,
- name, &sdib);
+ NDR_PRINT_DEBUG_LEVEL(lvl, secrets_domain_infoB, &sdib);
}
char *secrets_domain_info_string(TALLOC_CTX *mem_ctx, const struct secrets_domain_info1 *info1,
diff --git a/source3/winbindd/wb_dsgetdcname.c b/source3/winbindd/wb_dsgetdcname.c
index 95a75a9cbc5..ab9be5b5a1b 100644
--- a/source3/winbindd/wb_dsgetdcname.c
+++ b/source3/winbindd/wb_dsgetdcname.c
@@ -47,6 +47,10 @@ struct tevent_req *wb_dsgetdcname_send(TALLOC_CTX *mem_ctx,
return NULL;
}
+ D_INFO("WB command dsgetdcname start.\n"
+ "Search domain name %s and site name %s.\n",
+ domain_name,
+ site_name);
if (strequal(domain_name, "BUILTIN")) {
/*
* This makes no sense
@@ -119,7 +123,9 @@ NTSTATUS wb_dsgetdcname_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
req, struct wb_dsgetdcname_state);
NTSTATUS status;
+ D_INFO("WB command dsgetdcname end.\n");
if (tevent_req_is_nterror(req, &status)) {
+ D_WARNING("Failed with %s.\n", nt_errstr(status));
return status;
}
*pdcinfo = talloc_move(mem_ctx, &state->dcinfo);
diff --git a/source3/winbindd/wb_getgrsid.c b/source3/winbindd/wb_getgrsid.c
index fa26ea805ee..c62d5040dc9 100644
--- a/source3/winbindd/wb_getgrsid.c
+++ b/source3/winbindd/wb_getgrsid.c
@@ -45,11 +45,15 @@ struct tevent_req *wb_getgrsid_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req, *subreq;
struct wb_getgrsid_state *state;
+ struct dom_sid_buf buf;
req = tevent_req_create(mem_ctx, &state, struct wb_getgrsid_state);
if (req == NULL) {
return NULL;
}
+
+ D_INFO("WB command getgrsid start.\nLooking up group SID %s.\n", dom_sid_str_buf(group_sid, &buf));
+
sid_copy(&state->sid, group_sid);
state->ev = ev;
state->max_nesting = max_nesting;
@@ -205,7 +209,9 @@ NTSTATUS wb_getgrsid_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
req, struct wb_getgrsid_state);
NTSTATUS status;
+ D_INFO("WB command getgrsid end.\n");
if (tevent_req_is_nterror(req, &status)) {
+ D_WARNING("Failed with %s.\n", nt_errstr(status));
return status;
}
*domname = talloc_move(mem_ctx, &state->domname);
diff --git a/source3/winbindd/wb_getpwsid.c b/source3/winbindd/wb_getpwsid.c
index 7f168bdda7a..7d04c39ad84 100644
--- a/source3/winbindd/wb_getpwsid.c
+++ b/source3/winbindd/wb_getpwsid.c
@@ -40,11 +40,13 @@ struct tevent_req *wb_getpwsid_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req, *subreq;
struct wb_getpwsid_state *state;
+ struct dom_sid_buf buf;
req = tevent_req_create(mem_ctx, &state, struct wb_getpwsid_state);
if (req == NULL) {
return NULL;
}
+ D_INFO("WB command getpwsid start.\nQuery user SID %s.\n", dom_sid_str_buf(user_sid, &buf));
sid_copy(&state->sid, user_sid);
state->ev = ev;
state->pw = pw;
@@ -148,5 +150,7 @@ static void wb_getpwsid_queryuser_done(struct tevent_req *subreq)
NTSTATUS wb_getpwsid_recv(struct tevent_req *req)
{
- return tevent_req_simple_recv_ntstatus(req);
+ NTSTATUS status = tevent_req_simple_recv_ntstatus(req);
+ D_INFO("WB command getpwsid end.\nReturn status %s.\n", nt_errstr(status));
+ return status;
}
diff --git a/source3/winbindd/wb_gettoken.c b/source3/winbindd/wb_gettoken.c
index a393b0f09e7..dd8f0d37e71 100644
--- a/source3/winbindd/wb_gettoken.c
+++ b/source3/winbindd/wb_gettoken.c
@@ -18,6 +18,7 @@
*/
#include "includes.h"
+#include "util/debug.h"
#include "winbindd.h"
#include "librpc/gen_ndr/ndr_winbind_c.h"
#include "../libcli/security/security.h"
@@ -35,7 +36,7 @@ static NTSTATUS wb_add_rids_to_sids(TALLOC_CTX *mem_ctx,
uint32_t *pnum_sids,
struct dom_sid **psids,
const struct dom_sid *domain_sid,
- int num_rids, uint32_t *rids);
+ uint32_t num_rids, uint32_t *rids);
static void wb_gettoken_gotuser(struct tevent_req *subreq);
static void wb_gettoken_gotgroups(struct tevent_req *subreq);
@@ -49,6 +50,7 @@ struct tevent_req *wb_gettoken_send(TALLOC_CTX *mem_ctx,
{
struct tevent_req *req, *subreq;
struct wb_gettoken_state *state;
+ struct dom_sid_buf buf;
req = tevent_req_create(mem_ctx, &state, struct wb_gettoken_state);
if (req == NULL) {
@@ -58,6 +60,10 @@ struct tevent_req *wb_gettoken_send(TALLOC_CTX *mem_ctx,
state->ev = ev;
state->expand_local_aliases = expand_local_aliases;
+ D_INFO("WB command gettoken start.\n"
+ "Query user SID %s (expand local aliases is %d).\n",
+ dom_sid_str_buf(sid, &buf),
+ expand_local_aliases);
subreq = wb_queryuser_send(state, ev, &state->usersid);
if (tevent_req_nomem(subreq, req)) {
return tevent_req_post(req, ev);
@@ -74,6 +80,7 @@ static void wb_gettoken_gotuser(struct tevent_req *subreq)
req, struct wb_gettoken_state);
struct wbint_userinfo *info;
NTSTATUS status;
+ struct dom_sid_buf buf0, buf1;
status = wb_queryuser_recv(subreq, state, &info);
TALLOC_FREE(subreq);
@@ -87,9 +94,13 @@ static void wb_gettoken_gotuser(struct tevent_req *subreq)
}
state->num_sids = 2;
+ D_DEBUG("Got user SID %s and group SID %s\n",
+ dom_sid_str_buf(&info->user_sid, &buf0),
+ dom_sid_str_buf(&info->group_sid, &buf1));
sid_copy(&state->sids[0], &info->user_sid);
sid_copy(&state->sids[1], &info->group_sid);
+ D_DEBUG("Looking up user groups for the user SID.\n");
subreq = wb_lookupusergroups_send(state, state->ev, &info->user_sid);
if (tevent_req_nomem(subreq, req)) {
return;
@@ -103,10 +114,11 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq)
subreq, struct tevent_req);
struct wb_gettoken_state *state = tevent_req_data(
req, struct wb_gettoken_state);
- int i, num_groups;
+ uint32_t i, num_groups;
struct dom_sid *groups;
struct winbindd_domain *domain;
NTSTATUS status;
+ struct dom_sid_buf buf;
status = wb_lookupusergroups_recv(subreq, state, &num_groups, &groups);
TALLOC_FREE(subreq);
@@ -115,7 +127,9 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq)
return;
}
- for (i=0; i<num_groups; i++) {
+ D_DEBUG("Received %u group(s).\n", num_groups);
+ for (i = 0; i < num_groups; i++) {
+ D_DEBUG("Adding SID %s.\n", dom_sid_str_buf(&groups[i], &buf));
status = add_sid_to_array_unique(
state, &groups[i], &state->sids, &state->num_sids);
@@ -125,6 +139,7 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq)
}
if (!state->expand_local_aliases) {
+ D_DEBUG("Done. Not asked to expand local aliases.\n");
tevent_req_done(req);
return;
}
@@ -138,6 +153,7 @@ static void wb_gettoken_gotgroups(struct tevent_req *subreq)
return;
}
+ D_DEBUG("Expand domain's aliases for %u SID(s).\n", state->num_sids);
subreq = wb_lookupuseraliases_send(state, state->ev, domain,
state->num_sids, state->sids);
if (tevent_req_nomem(subreq, req)) {
@@ -163,6 +179,7 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req *subreq)
return;
}
+ D_DEBUG("Got %u RID(s).\n", num_rids);
status = wb_add_rids_to_sids(state, &state->num_sids, &state->sids,
get_global_sam_sid(), num_rids, rids);
if (tevent_req_nterror(req, status)) {
@@ -174,6 +191,7 @@ static void wb_gettoken_gotlocalgroups(struct tevent_req *subreq)
* Now expand the builtin groups
*/
+ D_DEBUG("Expand the builtin groups for %u SID(s).\n", state->num_sids);
domain = find_domain_from_sid(&global_sid_Builtin);
if (domain == NULL) {
tevent_req_nterror(req, NT_STATUS_INTERNAL_ERROR);
@@ -203,6 +221,7 @@ static void wb_gettoken_gotbuiltins(struct tevent_req *subreq)
if (tevent_req_nterror(req, status)) {
return;
}
+ D_DEBUG("Got %u RID(s).\n", num_rids);
status = wb_add_rids_to_sids(state, &state->num_sids, &state->sids,
&global_sid_Builtin, num_rids, rids);
if (tevent_req_nterror(req, status)) {
@@ -212,16 +231,23 @@ static void wb_gettoken_gotbuiltins(struct tevent_req *subreq)
}
NTSTATUS wb_gettoken_recv(struct tevent_req *req, TALLOC_CTX *mem_ctx,
- int *num_sids, struct dom_sid **sids)
+ uint32_t *num_sids, struct dom_sid **sids)
{
struct wb_gettoken_state *state = tevent_req_data(
req, struct wb_gettoken_state);
NTSTATUS status;
+ uint32_t i;
if (tevent_req_is_nterror(req, &status)) {
return status;
}
*num_sids = state->num_sids;
+ D_INFO("WB command gettoken end.\nReceived %u SID(s).\n", state->num_sids);
+ for (i = 0; i < state->num_sids; i++) {
+ struct dom_sid_buf sidbuf;
+ D_INFO("%u: %s\n", i, dom_sid_str_buf(&state->sids[i], &sidbuf));
+ }
+
*sids = talloc_move(mem_ctx, &state->sids);
return NT_STATUS_OK;
}
@@ -230,11 +256,13 @@ static NTSTATUS wb_add_rids_to_sids(TALLOC_CTX *mem_ctx,
uint32_t *pnum_sids,
struct dom_sid **psids,
const struct dom_sid *domain_sid,
- int num_rids, uint32_t *rids)
+ uint32_t num_rids, uint32_t *rids)
{
- int i;
-
- for (i=0; i<num_rids; i++) {
+ uint32_t i;
+ D_DEBUG("%u SID(s) will be uniquely added to the SID array.\n"
+ "Before the addition the array has %u SID(s).\n",
+ num_rids, *pnum_sids);
+ for (i = 0; i < num_rids; i++) {
NTSTATUS status;
struct dom_sid sid;
@@ -246,6 +274,6 @@ static NTSTATUS wb_add_rids_to_sids(TALLOC_CTX *mem_ctx,
return status;
}
}
-
+ D_DEBUG("After the addition the array has %u SID(s).\n", *pnum_sids);
return NT_STATUS_OK;
--
Samba Shared Repository
More information about the samba-cvs
mailing list