Merge branch 'wip-msgauth4'

Conflicts:
	src/common/config_opts.h
	Added a couple of options related to session authentication, accepted new values for option from master

diff --cc src/Makefile.am
Simple merge

diff --cc src/common/config_opts.h
index c95af92b58b5434ee42671b3821ed6acaa36a475,fe360f258ea70fd43c81bbf37bd28d871f75f9b0..49a7c0bf2b19616afe9d7bf9bcc2beae3b83363c
--- 1/src/common/config_opts.h
--- 2/src/common/config_opts.h
+++ b/src/common/config_opts.h
@@@ -143,10 -141,12 +143,12 @@@ OPTION(paxos_max_join_drift, OPT_INT, 1
  OPTION(paxos_propose_interval, OPT_DOUBLE, 1.0)  // gather updates for this long before proposing a map update
  OPTION(paxos_min_wait, OPT_DOUBLE, 0.05)  // min time to gather updates for after period of inactivity
  OPTION(clock_offset, OPT_DOUBLE, 0) // how much to offset the system clock in Clock.cc
 -OPTION(auth_cluster_required, OPT_STR, "")   // required of mon, mds, osd daemons
 -OPTION(auth_service_required, OPT_STR, "")   // required by daemons of clients
 -OPTION(auth_client_required, OPT_STR, "")    // what clients require of daemons
 -OPTION(auth_supported, OPT_STR, "none")          // deprecated; default value for above if they are not defined.
 +OPTION(auth_cluster_required, OPT_STR, "cephx")   // required of mon, mds, osd daemons
 +OPTION(auth_service_required, OPT_STR, "cephx")   // required by daemons of clients
 +OPTION(auth_client_required, OPT_STR, "")         // what clients require of daemons
 +OPTION(auth_supported, OPT_STR, "")               // deprecated; default value for above if they are not defined.
+ OPTION(cephx_require_signatures, OPT_BOOL, false) //  If true, don't talk to Cephx partners if they don't support message signing; off by default
+ OPTION(cephx_sign_messages, OPT_BOOL, true)  // Default to signing session messages if supported
  OPTION(auth_mon_ticket_ttl, OPT_DOUBLE, 60*60*12)
  OPTION(auth_service_ticket_ttl, OPT_DOUBLE, 60*60)
  OPTION(mon_client_hunt_interval, OPT_DOUBLE, 3.0)   // try new mon every N seconds until we connect

diff --cc src/mds/MDS.cc
Simple merge

diff --cc src/mon/MonClient.cc
Simple merge

diff --cc src/mon/MonClient.h
Simple merge

diff --cc src/mon/Monitor.cc
Simple merge

diff --cc src/mon/Monitor.h
Simple merge

diff --cc src/msg/Pipe.cc
Simple merge

diff --cc src/osd/OSD.cc
Simple merge