From 834612d9fc3ce15991e1e3b97bc0af02d23775d5 Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 12 May 2003 21:56:52 +0000 Subject: Fix up the build-farm testsuite again - I forgot to move some files into the template dir, and idra's checkin removed smbpasswd_nua. Andrew Bartlett (This used to be commit a7b34564ae4615c2585a82aa248a9cf92905254d) --- testsuite/build_farm/basicsmb.smb.conf.domain | 2 -- testsuite/build_farm/basicsmb.smb.conf.hostsdeny | 1 - testsuite/build_farm/basicsmb.smb.conf.server | 3 --- testsuite/build_farm/basicsmb.smb.conf.share | 1 - testsuite/build_farm/basicsmb.smb.conf.user | 1 - testsuite/build_farm/template/basicsmb.smb.conf | 2 +- testsuite/build_farm/template/basicsmb.smb.conf.domain | 2 ++ testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny | 1 + testsuite/build_farm/template/basicsmb.smb.conf.server | 3 +++ testsuite/build_farm/template/basicsmb.smb.conf.share | 1 + testsuite/build_farm/template/basicsmb.smb.conf.user | 1 + 11 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 testsuite/build_farm/basicsmb.smb.conf.domain delete mode 100644 testsuite/build_farm/basicsmb.smb.conf.hostsdeny delete mode 100644 testsuite/build_farm/basicsmb.smb.conf.server delete mode 100644 testsuite/build_farm/basicsmb.smb.conf.share delete mode 100644 testsuite/build_farm/basicsmb.smb.conf.user create mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.domain create mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny create mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.server create mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.share create mode 100644 testsuite/build_farm/template/basicsmb.smb.conf.user (limited to 'testsuite') diff --git a/testsuite/build_farm/basicsmb.smb.conf.domain b/testsuite/build_farm/basicsmb.smb.conf.domain deleted file mode 100644 index 8b9728838e..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.domain +++ /dev/null @@ -1,2 +0,0 @@ -security=domain -password server=user diff --git a/testsuite/build_farm/basicsmb.smb.conf.hostsdeny b/testsuite/build_farm/basicsmb.smb.conf.hostsdeny deleted file mode 100644 index 3fce0bdbf4..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.hostsdeny +++ /dev/null @@ -1 +0,0 @@ - hosts deny = 127. \ No newline at end of file diff --git a/testsuite/build_farm/basicsmb.smb.conf.server b/testsuite/build_farm/basicsmb.smb.conf.server deleted file mode 100644 index 016f84cd35..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.server +++ /dev/null @@ -1,3 +0,0 @@ -security=server -password server=user -smb passwd file=NON_EXISTANT_FILE diff --git a/testsuite/build_farm/basicsmb.smb.conf.share b/testsuite/build_farm/basicsmb.smb.conf.share deleted file mode 100644 index 8e69cc199a..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.share +++ /dev/null @@ -1 +0,0 @@ - security = share diff --git a/testsuite/build_farm/basicsmb.smb.conf.user b/testsuite/build_farm/basicsmb.smb.conf.user deleted file mode 100644 index 9d294b9c39..0000000000 --- a/testsuite/build_farm/basicsmb.smb.conf.user +++ /dev/null @@ -1 +0,0 @@ - security = user diff --git a/testsuite/build_farm/template/basicsmb.smb.conf b/testsuite/build_farm/template/basicsmb.smb.conf index ad60b755af..ecc64051c0 100644 --- a/testsuite/build_farm/template/basicsmb.smb.conf +++ b/testsuite/build_farm/template/basicsmb.smb.conf @@ -17,7 +17,7 @@ panic action = /bin/sh BUILD_FARM/samba/testsuite/build_farm/backtrace %d - passdb backend = smbpasswd_nua + passdb backend = smbpasswd winbind uid = 10000-200000 map hidden = yes diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.domain b/testsuite/build_farm/template/basicsmb.smb.conf.domain new file mode 100644 index 0000000000..8b9728838e --- /dev/null +++ b/testsuite/build_farm/template/basicsmb.smb.conf.domain @@ -0,0 +1,2 @@ +security=domain +password server=user diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny new file mode 100644 index 0000000000..3fce0bdbf4 --- /dev/null +++ b/testsuite/build_farm/template/basicsmb.smb.conf.hostsdeny @@ -0,0 +1 @@ + hosts deny = 127. \ No newline at end of file diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.server b/testsuite/build_farm/template/basicsmb.smb.conf.server new file mode 100644 index 0000000000..016f84cd35 --- /dev/null +++ b/testsuite/build_farm/template/basicsmb.smb.conf.server @@ -0,0 +1,3 @@ +security=server +password server=user +smb passwd file=NON_EXISTANT_FILE diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.share b/testsuite/build_farm/template/basicsmb.smb.conf.share new file mode 100644 index 0000000000..8e69cc199a --- /dev/null +++ b/testsuite/build_farm/template/basicsmb.smb.conf.share @@ -0,0 +1 @@ + security = share diff --git a/testsuite/build_farm/template/basicsmb.smb.conf.user b/testsuite/build_farm/template/basicsmb.smb.conf.user new file mode 100644 index 0000000000..9d294b9c39 --- /dev/null +++ b/testsuite/build_farm/template/basicsmb.smb.conf.user @@ -0,0 +1 @@ + security = user -- cgit