[SCM] Samba Shared Repository - branch v3-2-stable updated - release-3-2-0pre3-71-gfb691ba

Karolin Seeger kseeger at samba.org
Tue May 13 06:59:52 GMT 2008


The branch, v3-2-stable has been updated
       via  fb691bab6b66c8b1f5535d6bfb5884a43fa38f4c (commit)
       via  b85b7d85c20551a2bf53fc541b3de5cae3f37521 (commit)
      from  03521136ccb4d4a52c9c0373beed7df2485397a9 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-stable


- Log -----------------------------------------------------------------
commit fb691bab6b66c8b1f5535d6bfb5884a43fa38f4c
Author: Jeremy Allison <jra at samba.org>
Date:   Fri May 9 14:54:06 2008 -0700

    Fix replacement getpass. If we ^C at the prompt echo was left off.
    Fix bug #5456. Karolin please pull for 3.2-stable.
    Jeremy.
    (cherry picked from commit 726d9d168d5b4bca86b478c34204eacb97907443)

commit b85b7d85c20551a2bf53fc541b3de5cae3f37521
Author: coffeedude <coffeedude at drizzt.ad.plainjoe.org>
Date:   Mon May 12 17:33:01 2008 -0500

    net ads: Upper case he realm name when calling kinit() using machine creds.
    
    Needed fix for the DNS Update option as part of "net ads join"
    (cherry picked from commit aebae0b71b427838fdc6344d69d6dea87a5dd58b)
    (cherry picked from commit 437a59598d886b316fd58ca88ed40f5fb325c47f)

-----------------------------------------------------------------------

Summary of changes:
 source/lib/replace/getpass.c |    7 ++-----
 source/utils/net_ads.c       |    1 +
 2 files changed, 3 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/lib/replace/getpass.c b/source/lib/replace/getpass.c
index 73333b9..0be618f 100644
--- a/source/lib/replace/getpass.c
+++ b/source/lib/replace/getpass.c
@@ -187,10 +187,6 @@ char *rep_getpass(const char *prompt)
 		in_fd = fileno(in);
 		if (fgets(buf, bufsize, in) == NULL) {
 			buf[0] = 0;
-			if (in && in != stdin) {
-				fclose(in);
-			}
-			return buf;
 		}
 	}
 	nread = strlen(buf);
@@ -201,8 +197,9 @@ char *rep_getpass(const char *prompt)
 
 	/* Restore echoing.  */
 	if (echo_off) {
-		if (gotintr && in_fd == -1)
+		if (gotintr && in_fd == -1) {
 			in = fopen ("/dev/tty", "w+");
+		}
 		if (in != NULL)
 			tcsetattr (fileno (in), TCSANOW, &t);
 	}
diff --git a/source/utils/net_ads.c b/source/utils/net_ads.c
index 3df9e2c..ad8882c 100644
--- a/source/utils/net_ads.c
+++ b/source/utils/net_ads.c
@@ -1227,6 +1227,7 @@ int net_ads_join(int argc, const char **argv)
 			ads_dns->auth.password = secrets_fetch_machine_password(
 				r->out.netbios_domain_name, NULL, NULL );
 			ads_dns->auth.realm = SMB_STRDUP( r->out.dns_domain_name );
+			strupper_m(ads_dns->auth.realm );
 			ads_kinit_password( ads_dns );
 		}
 


-- 
Samba Shared Repository


More information about the samba-cvs mailing list