Rev 634: merge from ronnie in http://samba.org/~tridge/ctdb

tridge at samba.org tridge at samba.org
Fri Sep 21 04:47:32 GMT 2007


------------------------------------------------------------
revno: 634
revision-id: tridge at samba.org-20070921044732-ifefejtryjngs7e2
parent: tridge at samba.org-20070921022402-3746po96fq3a3jfu
parent: sahlberg at ronnie-20070921034740-pxr9aj2i46rugv22
committer: Andrew Tridgell <tridge at samba.org>
branch nick: tridge
timestamp: Fri 2007-09-21 14:47:32 +1000
message:
  merge from ronnie
modified:
  server/ctdb_ltdb_server.c      ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1
  web/ftp.html                   ftp.html-20070609033412-pwzhwyuj4qnifmmm-1
    ------------------------------------------------------------
    revno: 432.1.293
    revision-id: sahlberg at ronnie-20070921034740-pxr9aj2i46rugv22
    parent: sahlberg at ronnie-20070921032029-yzz98hdpgl18h5j3
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Fri 2007-09-21 13:47:40 +1000
    message:
      when ctdb attaches to a database  it broadcasts the attach to all other 
      nodes so that the db is created on them as well
      
      when we send this broadcast   we must use the correct control and not 
      assume all databases created are of the temporary kind 
    modified:
      server/ctdb_ltdb_server.c      ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1
    ------------------------------------------------------------
    revno: 432.1.292
    revision-id: sahlberg at ronnie-20070921032029-yzz98hdpgl18h5j3
    parent: sahlberg at ronnie-20070919015445-uby9z9qpl4qfvu0y
    parent: tridge at samba.org-20070921022402-3746po96fq3a3jfu
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Fri 2007-09-21 13:20:29 +1000
    message:
      merge from tridge
    added:
      server/ctdb_persistent.c       ctdb_persistent.c-20070920053845-u2ggm5relkdor3xg-1
      tests/ctdb_persistent.c        ctdb_persistent.c-20070921022331-6ubn98ak9nwbzjzv-1
      tests/persistent.sh            persistent.sh-20070921022335-ytbefhrr45n2mc3j-1
    modified:
      Makefile.in                    makefile.in-20061117234101-o3qt14umlg9en8z0-1
      client/ctdb_client.c           ctdb_client.c-20070411010216-3kd8v37k61steeya-1
      common/ctdb_util.c             ctdb_util.c-20061128065342-to93h6eejj5kon81-3
      include/ctdb.h                 ctdb.h-20061117234101-o3qt14umlg9en8z0-11
      include/ctdb_private.h         ctdb_private.h-20061117234101-o3qt14umlg9en8z0-13
      server/ctdb_control.c          ctdb_control.c-20070426122724-j6gkpiofhbwdin63-1
      server/ctdb_daemon.c           ctdb_daemon.c-20070409200331-3el1kqgdb9m4ib0g-1
      server/ctdb_ltdb_server.c      ctdb_ltdb_server.c-20070607120348-7r182h0nlqxysyss-1
      server/ctdb_recover.c          ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
      server/ctdb_recoverd.c         recoverd.c-20070503213540-bvxuyd9jm1f7ig90-1
      server/ctdb_server.c           ctdb.c-20061127094323-t50f58d65iaao5of-2
      server/ctdb_traverse.c         ctdb_traverse.c-20070503021550-ztfs5rwx8jfm8qqx-1
      server/ctdbd.c                 ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
      tests/ctdb_bench.c             ctdb_bench.c-20061219052637-2liagoglohxb6p7s-1
      tests/ctdb_fetch.c             ctdb_fetch.c-20070405031748-f7gslozfj3rwh5ie-1
      tests/ctdb_store.c             ctdb_store.c-20070617011248-7ze8iaf75dwi0tk0-1
      tests/start_daemons.sh         start_daemons.sh-20070604074603-fbb8x90srun04xn0-1
      tools/ctdb.c                   ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
    ------------------------------------------------------------
    revno: 432.1.291
    revision-id: sahlberg at ronnie-20070919015445-uby9z9qpl4qfvu0y
    parent: sahlberg at ronnie-20070919015348-jdf22qbfd9jyerny
    parent: tridge at samba.org-20070919014637-ugbcrhuu6n9aoss9
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-09-19 11:54:45 +1000
    message:
      merge from tridge
    modified:
      lib/events/events_epoll.c      events_epoll.c-20070501213746-4fxluwiq4rcxib8p-2
      lib/tdb/common/open.c          open.c-20070220022425-m1wibgjq7n5hahs6-8
      server/ctdb_recover.c          ctdb_recover.c-20070503002147-admmfgt1oj6gexfo-1
      tools/ctdb_diagnostics         ctdb_diagnostics-20070905041904-9d9r1qnt1j9qiwiz-1
    ------------------------------------------------------------
    revno: 432.1.290
    revision-id: sahlberg at ronnie-20070919015348-jdf22qbfd9jyerny
    parent: sahlberg at ronnie-20070917030116-twubk8qstkmgbn5x
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Wed 2007-09-19 11:53:48 +1000
    message:
      one more command to run to enable winbind for vsftpd
    modified:
      web/ftp.html                   ftp.html-20070609033412-pwzhwyuj4qnifmmm-1
    ------------------------------------------------------------
    revno: 432.1.289
    revision-id: sahlberg at ronnie-20070917030116-twubk8qstkmgbn5x
    parent: sahlberg at ronnie-20070916214315-4ioh9wajdgg76nxc
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-09-17 13:01:16 +1000
    message:
      add documantation of additional requirements for FTP so that users can 
      log in and access files using the AD username/password
    modified:
      web/ftp.html                   ftp.html-20070609033412-pwzhwyuj4qnifmmm-1
    ------------------------------------------------------------
    revno: 432.1.288
    revision-id: sahlberg at ronnie-20070916214315-4ioh9wajdgg76nxc
    parent: sahlberg at ronnie-20070914051944-3d1gtwpmln8e1oxr
    parent: tridge at samba.org-20070914092711-1dm1plu6xckr77gx
    committer: Ronnie Sahlberg <sahlberg at ronnie>
    branch nick: ctdb
    timestamp: Mon 2007-09-17 07:43:15 +1000
    message:
      merge from tridge
    modified:
      config/ctdb.init               ctdb.init-20070527204758-biuh7znabuwan3zn-6
      config/events.d/00.ctdb        events-20070529030121-04fjh63cxfh8v1pj-1
      config/events.d/10.interface   10.interface-20070604050809-s21zslfirn07zjt8-1
      config/events.d/40.vsftpd      40.vsftpd-20070605080716-mih15mjbgsjt7niv-1
      config/events.d/50.samba       samba-20070601105340-vlcvnp6euoj3zdwy-3
      config/events.d/60.nfs         nfs-20070601141008-hy3h4qgbk1jd2jci-1
      config/events.d/61.nfstickle   61.nfstickle-20070706005204-6etuzuk8b86aoua5-1
      config/functions               functions-20070601105405-gajwirydr5a9zd6x-1
      config/statd-callout           statdcallout-20070531010857-6sdlz455vusye5y5-1
      packaging/RPM/ctdb.spec        ctdb.spec-20070527204758-biuh7znabuwan3zn-3
      server/ctdbd.c                 ctdbd.c-20070411085044-dqmhr6mfeexnyt4m-1
      tools/ctdb.c                   ctdb_control.c-20070426122705-9ehj1l5lu2gn9kuj-1
=== modified file 'server/ctdb_ltdb_server.c'
--- a/server/ctdb_ltdb_server.c	2007-09-21 02:24:02 +0000
+++ b/server/ctdb_ltdb_server.c	2007-09-21 03:47:40 +0000
@@ -332,7 +332,9 @@
 
 	/* tell all the other nodes about this database */
 	ctdb_daemon_send_control(ctdb, CTDB_BROADCAST_ALL, 0,
-				 CTDB_CONTROL_DB_ATTACH, 0, CTDB_CTRL_FLAG_NOREPLY,
+				 persistent?CTDB_CONTROL_DB_ATTACH_PERSISTENT:
+						CTDB_CONTROL_DB_ATTACH,
+				 0, CTDB_CTRL_FLAG_NOREPLY,
 				 indata, NULL, NULL);
 
 	/* success */

=== modified file 'web/ftp.html'
--- a/web/ftp.html	2007-06-12 04:43:26 +0000
+++ b/web/ftp.html	2007-09-19 01:53:48 +0000
@@ -25,6 +25,45 @@
   chkconfig vsftpd off
 </pre>
 
+<h2>PAM configuration</h2>
+PAM must be configured to allow authentication of CIFS users so that the ftp 
+daemon can authenticate the users logging in.
+
+Make sure the following line is present in /etc/pam.d/system-auth
+<pre>
+auth        sufficient    pam_winbind.so use_first_pass
+
+</pre>
+If this line is missing you must enable winbind authentication by running 
+<pre>
+authconfig  --enablewinbindauth --update
+authconfig  --enablewinbind --update
+</pre>
+
+<h2>Default shell</h2>
+To log in to the ftp server, the user must have a shell configured in smb.conf.
+
+Add the following line to the globals section of /etc/samba/smb.conf 
+<pre>
+	template shell = /bin/bash
+</pre>
+
+<h2>Home directory</h2>
+FTP users must have a home directory configured so they can log in.
+Configure samba to provide home directories for domain users. These home 
+directories should be stored on shared storage so they are available from
+all nodes in the cluster.<br>
+
+
+A simple way to create homedirectories are to add
+<pre>
+	template homedir = /&lt;shared storage&gt;/homedir/%D/%U
+</pre>
+to /etc/samba/smb.conf .<br>
+
+The homedirectory must exist or the user will not be able to log in with FTP.
+
+
 <h2>Events script</h2>
 
 The CTDB distribution already comes with an events script for vsftp in the file /etc/ctdb/events.d/40.vsftpd<br><br>



More information about the samba-cvs mailing list