File _service:tar_scm:remove-sensitive-info.patch of Package samba

File _service:tar_scm:remove-sensitive-info.patch of Package samba (Revision a4d53ee452278e4fe37aafc87d1caf36)

Currently displaying revision a4d53ee452278e4fe37aafc87d1caf36 , Show latest

From 54e951d6795bad1f0451ea2e03403e791df3856a Mon Sep 17 00:00:00 2001
From: zhouyihang <zhouyihang3@huawei.com>
Date: Fri, 25 Dec 2020 00:11:23 +0800
Subject: [PATCH] remove sensitive info

Conflict: NA
Reference: NA

diff --git a/source3/lib/netapi/examples/share/share_enum.c b/source3/lib/netapi/examples/share/share_enum.c
index b1f4043..ee69d60 100644
--- a/source3/lib/netapi/examples/share/share_enum.c
+++ b/source3/lib/netapi/examples/share/share_enum.c
@@ -118,7 +118,6 @@ int main(int argc, const char **argv)
 						printf("#%d max users: %d\n", i, i2->shi2_max_uses);
 						printf("#%d current users: %d\n", i, i2->shi2_current_uses);
 						printf("#%d path: %s\n", i, i2->shi2_path);
-						printf("#%d password: %s\n", i, i2->shi2_passwd);
 						i2++;
 						break;
 					default:
diff --git a/source3/lib/netapi/examples/share/share_getinfo.c b/source3/lib/netapi/examples/share/share_getinfo.c
index 479da5c..3ef7825 100644
--- a/source3/lib/netapi/examples/share/share_getinfo.c
+++ b/source3/lib/netapi/examples/share/share_getinfo.c
@@ -128,7 +128,6 @@ int main(int argc, const char **argv)
 			printf("max users: %d\n", i2->shi2_max_uses);
 			printf("current users: %d\n", i2->shi2_current_uses);
 			printf("path: %s\n", i2->shi2_path);
-			printf("password: %s\n", i2->shi2_passwd);
 			break;
 		case 501:
 			printf("netname: %s\n", i501->shi501_netname);
diff --git a/source3/lib/netapi/examples/user/user_getinfo.c b/source3/lib/netapi/examples/user/user_getinfo.c
index 9e95260..154aa7d 100644
--- a/source3/lib/netapi/examples/user/user_getinfo.c
+++ b/source3/lib/netapi/examples/user/user_getinfo.c
@@ -104,7 +104,6 @@ int main(int argc, const char **argv)
 		case 1:
 			u1 = (struct USER_INFO_1 *)buffer;
 			printf("name: %s\n", u1->usri1_name);
-			printf("password: %s\n", u1->usri1_password);
 			printf("password_age: %d\n", u1->usri1_password_age);
 			printf("priv: %d\n", u1->usri1_priv);
 			printf("homedir: %s\n", u1->usri1_home_dir);
@@ -115,7 +114,6 @@ int main(int argc, const char **argv)
 		case 2:
 			u2 = (struct USER_INFO_2 *)buffer;
 			printf("name: %s\n", u2->usri2_name);
-			printf("password: %s\n", u2->usri2_password);
 			printf("password_age: %d\n", u2->usri2_password_age);
 			printf("priv: %d\n", u2->usri2_priv);
 			printf("homedir: %s\n", u2->usri2_home_dir);
@@ -187,7 +185,6 @@ int main(int argc, const char **argv)
 		case 4:
 			u4 = (struct USER_INFO_4 *)buffer;
 			printf("name: %s\n", u4->usri4_name);
-			printf("password: %s\n", u4->usri4_password);
 			printf("password_age: %d\n", u4->usri4_password_age);
 			printf("priv: %d\n", u4->usri4_priv);
 			printf("homedir: %s\n", u4->usri4_home_dir);
diff --git a/source3/rpcclient/cmd_lsarpc.c b/source3/rpcclient/cmd_lsarpc.c
index abb4543..81baece 100644
--- a/source3/rpcclient/cmd_lsarpc.c
+++ b/source3/rpcclient/cmd_lsarpc.c
@@ -1289,9 +1289,6 @@ static void display_trust_dom_info_4(struct lsa_TrustDomainInfoPassword *p,
 	pwd 	= sess_decrypt_string(talloc_tos(), &data, &session_key);
 	pwd_old = sess_decrypt_string(talloc_tos(), &data_old, &session_key);
 
-	d_printf("Password:\t%s\n", pwd);
-	d_printf("Old Password:\t%s\n", pwd_old);
-
 	talloc_free(pwd);
 	talloc_free(pwd_old);
 }
diff --git a/source3/rpcclient/cmd_srvsvc.c b/source3/rpcclient/cmd_srvsvc.c
index 9c00060..b107741 100644
--- a/source3/rpcclient/cmd_srvsvc.c
+++ b/source3/rpcclient/cmd_srvsvc.c
@@ -233,7 +233,6 @@ static void display_share_info_2(struct srvsvc_NetShareInfo2 *r)
 	printf("netname: %s\n", r->name);
 	printf("\tremark:\t%s\n", r->comment);
 	printf("\tpath:\t%s\n", r->path);
-	printf("\tpassword:\t%s\n", r->password);
 }
 
 static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
@@ -241,7 +240,6 @@ static void display_share_info_502(struct srvsvc_NetShareInfo502 *r)
 	printf("netname: %s\n", r->name);
 	printf("\tremark:\t%s\n", r->comment);
 	printf("\tpath:\t%s\n", r->path);
-	printf("\tpassword:\t%s\n", r->password);
 
 	printf("\ttype:\t0x%x\n", r->type);
 	printf("\tperms:\t%d\n", r->permissions);
diff --git a/source3/utils/net_rpc.c b/source3/utils/net_rpc.c
index a56190f..28a1808 100644
--- a/source3/utils/net_rpc.c
+++ b/source3/utils/net_rpc.c
@@ -5582,7 +5582,6 @@ static NTSTATUS rpc_sh_share_info(struct net_context *c,
 	d_printf(_("Name:     %s\n"), info.info2->name);
 	d_printf(_("Comment:  %s\n"), info.info2->comment);
 	d_printf(_("Path:     %s\n"), info.info2->path);
-	d_printf(_("Password: %s\n"), info.info2->password);
 
  done:
 	return werror_to_ntstatus(result);
diff --git a/source4/scripting/bin/samba3dump b/source4/scripting/bin/samba3dump
index 1a5d74f..4b311c2 100755
--- a/source4/scripting/bin/samba3dump
+++ b/source4/scripting/bin/samba3dump
@@ -70,8 +70,6 @@ def print_samba3_secrets(secrets):
         print("IPC Credentials:")
         if secrets.get_auth_user():
             print("    User: %s\n" % secrets.get_auth_user())
-        if secrets.get_auth_password():
-            print("    Password: %s\n" % secrets.get_auth_password())
         if secrets.get_auth_domain():
             print("    Domain: %s\n" % secrets.get_auth_domain())
 
diff --git a/source4/torture/shell.c b/source4/torture/shell.c
index 195149a..f63694a 100644
--- a/source4/torture/shell.c
+++ b/source4/torture/shell.c
@@ -240,7 +240,6 @@ static void shell_auth(const struct shell_command * command,
 	    printf("User Principal: %s\n", principal ? principal : "");
 	    printf("Domain: %s\n", domain ? domain : "");
 	    printf("Realm: %s\n", realm ? realm : "");
-	    printf("Password: %s\n", password ? password : "");
     } else if (argc == 2) {
 	    bool result;
 
-- 
2.23.0