Merge branch 'cloginrc-gpg'

jlisbz · Jun 21, 2012 · dc3e939 · dc3e939
2 parents c789c9a + d875e8d
commit dc3e939
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/clogin.in b/bin/clogin.in
@@ -312,7 +312,7 @@ proc source_password_file { password_file } {
 	set clogin_fd [open "| gpg --quiet --batch -o - $password_file" ]
 	set clogin_data [read $clogin_fd]
 	if { [llength $clogin_data] < 5 } {
-	    send_user "\nError decrypting file $password_file or no data in file $password_file.\n"
+	    send_user "\nError: could not decrypt file $password_file or no data in file $password_file.\n"
 	    exit 1
 	}
 	if [ catch {eval $clogin_data} reason ] {

diff --git a/bin/dlogin.in b/bin/dlogin.in
@@ -298,7 +298,7 @@ proc source_password_file { password_file } {
         set clogin_fd [open "| gpg --quiet --batch -o - $password_file" ]
         set clogin_data [read $clogin_fd]
         if { [llength $clogin_data] < 5 } {
-            send_user "\nError decrypting file $password_file or no data in file $password_file.\n"
+            send_user "\nError: could not decrypt file $password_file or no data in file $password_file.\n"
             exit 1
         }
         if [ catch {eval $clogin_data} reason ] {

diff --git a/bin/jlogin.in b/bin/jlogin.in
@@ -278,7 +278,7 @@ proc source_password_file { password_file } {
 	set clogin_fd [open "| gpg --quiet --batch -o - $password_file" ]
 	set clogin_data [read $clogin_fd]
 	if { [llength $clogin_data] < 5 } {
-	    send_user "\nError decrypting file $password_file or no data in file $password_file.\n"
+	    send_user "\nError: could not decrypt file $password_file or no data in file $password_file.\n"
 	    exit 1
 	}
 	if [ catch {eval $clogin_data} reason ] {