[Pvfs2-cvs] commit by dbonnie in pvfs2: configure configure.in

[CVS commit program]

Update of /anoncvs/pvfs2
In directory parlweb1:/tmp/cvs-serv12842

Modified Files:
      Tag: cu-security-branch
	configure configure.in 
Log Message:
Added configure flag "--disable-security"
Removed configure flag "--enable-security=[none]"


Index: configure
===================================================================
RCS file: /anoncvs/pvfs2/configure,v
diff -p -u -r1.388.2.4 -r1.388.2.5
--- configure	20 Jun 2008 19:12:37 -0000	1.388.2.4
+++ configure	23 Jul 2008 16:18:39 -0000	1.388.2.5
@@ -846,8 +846,8 @@ Optional Features:
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
   --disable-thread-safety Disables thread safety in the client library
   --disable-server Disables building of PVFS2 server
+  --disable-security Disables security encryption
   --enable-security=state type Specify the states type:
-                      none default: No encryption
                       rsa: RSA encryption
                       dsa: DSA encryption
   --disable-karma-mem-usage-stats Disables memory usage stats in karma
@@ -6375,36 +6375,44 @@ fi;
 # Check whether --enable-security or --disable-security was given.
 if test "${enable_security+set}" = set; then
   enableval="$enable_security"
-   if   test "x$enableval" = "xnone" ; then
-      SECURITY_TYPE=0
+  if test "x$enableval" = "xno" ; then
+    SECURITY_TYPE=1
+fi
 
-cat >>confdefs.h <<\_ACEOF
-#define SECURITY_ENCRYPTION_NONE
-_ACEOF
+fi;
 
-   elif test "x$enableval" = "xrsa" ; then
-      SECURITY_TYPE=1
+# Check whether --enable-security or --disable-security was given.
+if test "${enable_security+set}" = set; then
+  enableval="$enable_security"
+   if test "x$enableval" = "xrsa" ; then
+      SECURITY_TYPE=2
 
 cat >>confdefs.h <<\_ACEOF
 #define SECURITY_ENCRYPTION_RSA
 _ACEOF
 
    elif test "x$enableval" = "xdsa" ; then
-   	  SECURITY_TYPE=2
+   	  SECURITY_TYPE=3
 
 cat >>confdefs.h <<\_ACEOF
 #define SECURITY_ENCRYPTION_DSA
 _ACEOF
 
+   elif test "x$SECURITY_TYPE" = "x1" ; then
+
+cat >>confdefs.h <<\_ACEOF
+#define SECURITY_ENCRYPTION_NONE
+_ACEOF
+
    else
       echo
-      echo "Error!"
-      echo "Unknown encryption type!"
+      echo "Unknown security type!"
+      echo
       exit -1
    fi
 
 else
-  SECURITY_TYPE=0
+  SECURITY_TYPE=1
 
 cat >>confdefs.h <<\_ACEOF
 #define SECURITY_ENCRYPTION_NONE
@@ -19983,13 +19991,13 @@ else
 echo "${ECHO_T}PVFS2 will use workaround for buggy NPTL          : yes" >&6
 fi
 
-if   test "x$SECURITY_TYPE" = "x0" ; then
+if   test "x$SECURITY_TYPE" = "x1" ; then
    echo "$as_me:$LINENO: result: PVFS2 encryption type                             :none" >&5
 echo "${ECHO_T}PVFS2 encryption type                             :none" >&6
-elif test "x$SECURITY_TYPE" = "x1" ; then
+elif test "x$SECURITY_TYPE" = "x2" ; then
    echo "$as_me:$LINENO: result: PVFS2 encryption type                             : rsa" >&5
 echo "${ECHO_T}PVFS2 encryption type                             : rsa" >&6
-elif test "x$SECURITY_TYPE" = "x2" ; then
+elif test "x$SECURITY_TYPE" = "x3" ; then
    echo "$as_me:$LINENO: result: PVFS2 encryption type                             : dsa" >&5
 echo "${ECHO_T}PVFS2 encryption type                             : dsa" >&6
 fi

Index: configure.in
===================================================================
RCS file: /anoncvs/pvfs2/configure.in,v
diff -p -u -r1.340.2.4 -r1.340.2.5
--- configure.in	20 Jun 2008 19:12:58 -0000	1.340.2.4
+++ configure.in	23 Jul 2008 16:18:51 -0000	1.340.2.5
@@ -182,26 +182,31 @@ AC_ARG_WITH(openssl,
 	[AX_OPENSSL_OPTIONAL])
 	
 AC_ARG_ENABLE(security,
+[  --disable-security Disables security encryption],
+[if test "x$enableval" = "xno" ; then
+    SECURITY_TYPE=1
+fi]
+,)
+	
+AC_ARG_ENABLE(security,
  [  --enable-security[=state type] Specify the states type:
-                      none [default]: No encryption
                       rsa: RSA encryption
                       dsa: DSA encryption],
- [ if   test "x$enableval" = "xnone" ; then
-      SECURITY_TYPE=0
-      AC_DEFINE([SECURITY_ENCRYPTION_NONE], [], [No encryption])
-   elif test "x$enableval" = "xrsa" ; then
-      SECURITY_TYPE=1
+ [ if test "x$enableval" = "xrsa" ; then
+      SECURITY_TYPE=2
       AC_DEFINE([SECURITY_ENCRYPTION_RSA], [], [RSA encryption])
    elif test "x$enableval" = "xdsa" ; then
-   	  SECURITY_TYPE=2
+   	  SECURITY_TYPE=3
       AC_DEFINE([SECURITY_ENCRYPTION_DSA], [], [DSA encryption])
+   elif test "x$SECURITY_TYPE" = "x1" ; then
+      AC_DEFINE([SECURITY_ENCRYPTION_NONE], [], [No encryption])
    else
       echo
-      echo "Error!"
-      echo "Unknown encryption type!"
+      echo "Unknown security type!"
+      echo
       exit -1
    fi
- ], [SECURITY_TYPE=0
+ ], [SECURITY_TYPE=1
    AC_DEFINE([SECURITY_ENCRYPTION_NONE], [], [No encryption])
    ])
 
@@ -1191,11 +1196,11 @@ else
    AC_MSG_RESULT([PVFS2 will use workaround for buggy NPTL          : yes])
 fi
 
-if   test "x$SECURITY_TYPE" = "x0" ; then
+if   test "x$SECURITY_TYPE" = "x1" ; then
    AC_MSG_RESULT([PVFS2 encryption type                             :none])
-elif test "x$SECURITY_TYPE" = "x1" ; then
-   AC_MSG_RESULT([PVFS2 encryption type                             : rsa])
 elif test "x$SECURITY_TYPE" = "x2" ; then
+   AC_MSG_RESULT([PVFS2 encryption type                             : rsa])
+elif test "x$SECURITY_TYPE" = "x3" ; then
    AC_MSG_RESULT([PVFS2 encryption type                             : dsa])
 fi