From 75ebfc6f7a7692d772b729b2d83038a9054b4f90 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Fri, 12 May 2000 06:55:09 +0000
Subject: Merge from TNG. (This used to be commit
 af5ded9f17addb4bc89ecb762b9b99d2f99463ab)

---
 testsuite/nsswitch/finger.exp | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 testsuite/nsswitch/finger.exp

(limited to 'testsuite/nsswitch/finger.exp')

diff --git a/testsuite/nsswitch/finger.exp b/testsuite/nsswitch/finger.exp
new file mode 100644
index 0000000000..8a57f1c809
--- /dev/null
+++ b/testsuite/nsswitch/finger.exp
@@ -0,0 +1,27 @@
+#
+# @(#) Test default domain users resolve using the finger command
+#
+
+load_lib util-defs.exp
+load_lib "$srcdir/config/env.exp"
+load_lib "$srcdir/config/default-nt-names.exp"
+
+# Look up domain users using finger.  This should test getpwnam()
+
+foreach { user } $domain_users {
+    if {[util_test "finger" "-m $user" "" "no such user"] < 1} {
+        fail "finger -m $user"
+    } else {
+        pass "finger -m $user"
+    }
+}
+
+# Run finger without the -m to also test set/get/endpwent()
+
+foreach { user } $domain_users {
+    if {[util_test "finger" "$user" "" "no such user"] < 1} {
+        fail "finger $user"
+    } else {
+        pass "finger $user"
+    }
+}
-- 
cgit 


From dcc39ea43984fe9f9c683e48423794793a923e28 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Wed, 9 May 2001 04:59:49 +0000
Subject: Cleaned up bitrot in nsswitch testsuite.  Merged tests across from
 TNG branch. (This used to be commit acef477383e5739292e764c17cef87822a09f13b)

---
 testsuite/nsswitch/finger.exp | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'testsuite/nsswitch/finger.exp')

diff --git a/testsuite/nsswitch/finger.exp b/testsuite/nsswitch/finger.exp
index 8a57f1c809..ab3b28f58f 100644
--- a/testsuite/nsswitch/finger.exp
+++ b/testsuite/nsswitch/finger.exp
@@ -3,23 +3,37 @@
 #
 
 load_lib util-defs.exp
-load_lib "$srcdir/config/env.exp"
-load_lib "$srcdir/config/default-nt-names.exp"
 
-# Look up domain users using finger.  This should test getpwnam()
+set output [util_start "bin/wbinfo" "-u"]
+if { [regexp "Error" $output] } {
+    fail "error running wbinfo"
+    return
+}
+
+set user_list [split $output "\n"]
+
+# Look up all users using finger.  This should test getpwnam()
 
-foreach { user } $domain_users {
-    if {[util_test "finger" "-m $user" "" "no such user"] < 1} {
+foreach { user } $user_list {
+    set output [util_start "finger" "-m $user" "" "no such user"]
+    verbose $output
+
+    if { [regexp "no such user" $output] } {
         fail "finger -m $user"
     } else {
         pass "finger -m $user"
     }
 }
 
+verbose "testing finger -m"
+
 # Run finger without the -m to also test set/get/endpwent()
 
-foreach { user } $domain_users {
-    if {[util_test "finger" "$user" "" "no such user"] < 1} {
+foreach { user } $user_list {
+    set output [util_start "finger" "-m $user"]
+    verbose $output
+    
+    if { [regexp "no such user" $output] } {
         fail "finger $user"
     } else {
         pass "finger $user"
-- 
cgit 


From f45c2e52b756df6c1691a6f6b9957470bc217a48 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Mon, 26 Nov 2001 00:19:23 +0000
Subject: Allow lookup of users with spaces in their name. (This used to be
 commit 751ea8cfb931e1de6df447ed05e051262cdeb304)

---
 testsuite/nsswitch/finger.exp | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'testsuite/nsswitch/finger.exp')

diff --git a/testsuite/nsswitch/finger.exp b/testsuite/nsswitch/finger.exp
index ab3b28f58f..36bab8e199 100644
--- a/testsuite/nsswitch/finger.exp
+++ b/testsuite/nsswitch/finger.exp
@@ -12,10 +12,10 @@ if { [regexp "Error" $output] } {
 
 set user_list [split $output "\n"]
 
-# Look up all users using finger.  This should test getpwnam()
+# Look up all users using finger -m.  This should test getpwnam()
 
 foreach { user } $user_list {
-    set output [util_start "finger" "-m $user" "" "no such user"]
+    set output [util_start "finger" "-m \"$user\"" "" "no such user"]
     verbose $output
 
     if { [regexp "no such user" $output] } {
@@ -25,12 +25,10 @@ foreach { user } $user_list {
     }
 }
 
-verbose "testing finger -m"
-
 # Run finger without the -m to also test set/get/endpwent()
 
 foreach { user } $user_list {
-    set output [util_start "finger" "-m $user"]
+    set output [util_start "finger" "\"$user\""]
     verbose $output
     
     if { [regexp "no such user" $output] } {
-- 
cgit