From: Bdale Garbee <bdale@gag.com>
Date: Thu, 7 Oct 2010 21:54:06 +0000 (-0600)
Subject: patch from upstream for prompting problem when no tty associated with sudo
X-Git-Tag: debian/1.7.4p4-4~1
X-Git-Url: https://git.gag.com/?a=commitdiff_plain;h=e728e9e78f6751aee7d45d2105d58f2033e04e83;p=debian%2Fsudo

patch from upstream for prompting problem when no tty associated with sudo
---

diff --git a/check.c b/check.c
index d6efa6d..afb6c22 100644
--- a/check.c
+++ b/check.c
@@ -205,7 +205,7 @@ update_timestamp(timestampdir, timestampfile)
     char *timestampfile;
 {
     /* If using tty timestamps but we have no tty there is nothing to do. */
-    if (timestampfile && !user_ttypath)
+    if (def_tty_tickets && !user_ttypath)
 	return;
 
     if (timestamp_uid != 0)
@@ -528,7 +528,7 @@ timestamp_status(timestampdir, timestampfile, user, flags)
     if (timestampfile && status != TS_ERROR) {
 	if (status != TS_MISSING)
 	    status = TS_NOFILE;			/* dir there, file missing */
-	if (!user_ttypath)
+	if (def_tty_tickets && !user_ttypath)
 	    goto done;				/* no tty, always prompt */
 	if (lstat(timestampfile, &sb) == 0) {
 	    if (!S_ISREG(sb.st_mode)) {
diff --git a/debian/changelog b/debian/changelog
index 51eebde..687948b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+sudo (1.7.4p4-4) unstable; urgency=low
+
+  * patch from upstream to resolve problem always prompting for a password
+    when run without a tty, closes: #599376
+  * change path syntax to avoid tar error when /var/run/sudo exists but is
+    empty, closes: #598877
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 21 Sep 2010 23:53:08 -0600
+
 sudo (1.7.4p4-3) unstable; urgency=low
 
   * make postinst clause for handling /var/run -> /var/lib transition less