[NeoStats-Devel] [Commits] rev 2344 - in trunk: . src

Author: Mark
Date: Wed Mar 16 08:12:18 2005
New Revision: 2344

Modified:
   trunk/makeconf
   trunk/src/main.c
Log:
default DBM to gdbm and make config item optional

Modified: trunk/makeconf
==============================================================================
--- trunk/makeconf	(original)
+++ trunk/makeconf	Wed Mar 16 08:12:18 2005
@@ -241,41 +241,6 @@
 IRCD_DEFAULT=$INPUT
 echo ""
 
-####
-
-###########################################################################
-# select database
-#temp force until we have other support
-DATABASE="gdbm"
-#DATABASE_DEFAULT="1"
-#DATABASE=
-#validselection=0
-#echo "Which datbase storage do you wish to use?"
-#echo "     1) GDBM"
-#echo "     2) Berkeley DB"
-#while [ $validselection -eq 0 ] ; do
-#	echo $n " [$DATABASE_DEFAULT] -> $c"
-#	if read INPUT ; then : ; else echo "" ; exit 1 ; fi
-#	if [ ! "$INPUT" ] ; then
-#		INPUT=$DATABASE_DEFAULT
-#	fi
-#	case $INPUT in
-#		"1")
-# 			DATABASE="gdbm"
-#			validselection=1
-#			;;
-#		"2")
-# 			DATABASE="bdb"
-#			validselection=1
-#			;;
-#		*)
-#			echo "Please enter a valid option number."
-#			;;
-#	esac
-#done
-#DATABASE_DEFAULT=$INPUT
-#echo ""
-
 echo " "
 echo "What will your root nickname be? (ie: $ROOTNICK)"
 echo $n " [$ROOTNICK] -> $c"
@@ -364,8 +329,6 @@
 #    [RECOMMENDED] - optional but may cause problems if not set.
 #    [OPTIONAL]    - optional and the feature will be disabled if not set.
 #    [DISCOURAGED] - may cause undesirable side effects if enabled.
-#Although we have included instructions for each setting in this file
-#you should refer to the README file for more information
 ##################################################
 
 ##############################
@@ -385,15 +348,16 @@
 
 PROTOCOL "$IRCD"
 
-# DBM <dbm> [REQUIRED]
+# DBM <dbm> [OPTIONAL]
 #    Specifies the database manager module to use.
+#    NeoStats will default to GDBM if this is not provided.
 #    Valid options are:
 #          gdbm
 #
 #          DBM "gdbm"
 #      
-
-DBM "$DATABASE"
+#
+#DBM "$DATABASE"
 
 # ROOT_NICK <nick> [REQUIRED]
 #    Specifies the nick of the NeoStats root bot

Modified: trunk/src/main.c
==============================================================================
--- trunk/src/main.c	(original)
+++ trunk/src/main.c	Wed Mar 16 08:12:18 2005
@@ -194,6 +194,8 @@
 #ifdef WIN32
 	nsconfig.loglevel = LOG_NORMAL;
 #endif /* WIN32 */
+	/* default DBM */
+	strlcpy(me.dbm, "gdbm" ,MAXHOST );
 	return NS_SUCCESS;
 }