1. rm db and replace with text files in the iscsid.conf format (tools…

… will generate for user automatically). 2. Note lslsls! initiatornae.iscsi and iscsid.conf files have moved to /etc/iscsi

git-svn-id: svn://svn.berlios.de/open-iscsi@663 d7303112-9cec-0310-bdd2-e83a94d6c2b6

usr/Makefile

@@ -21,12 +21,10 @@ ifeq ($(OSNAME),Linux)
 	endif
 	endif
 IPC_OBJ=netlink.o
-DBM_LIB=-ldb
 else
 ifeq ($(OSNAME),FreeBSD)
 IPC_CFLAGS=
 IPC_OBJ=ioctl.o
-DBM_LIB=
 endif
 endif
 
@@ -45,10 +43,10 @@ INITIATOR_SRCS = initiator.o queue.o actor.o mgmt_ipc.o transport.o
 all: $(PROGRAMS)
 
 iscsid: $(COMMON_SRCS) $(IPC_OBJ) $(INITIATOR_SRCS) iscsid.o
-	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 
 iscsiadm: $(COMMON_SRCS) strings.o discovery.o iscsiadm.o
-	$(CC) $(CFLAGS) $^ $(DBM_LIB) -o $@
+	$(CC) $(CFLAGS) $^ -o $@
 
 iscsistart: $(IPC_OBJ) $(ISCSI_LIB_SRCS) $(INITIATOR_SRCS) iscsistart.o \
 		statics.o

usr/config.h

@@ -40,7 +40,7 @@
 #define TCP_WINDOW_SIZE (256 * 1024)
 
 /* number of possible connections per session */
-#define ISCSI_CONN_MAX		16
+#define ISCSI_CONN_MAX		1
 
 /* database version control */
 #define IDBM_VERSION		0x05
@@ -188,7 +188,6 @@ typedef struct session_rec {
 #define ISCSI_TRANSPORT_NAME_MAXLEN 16
 
 typedef struct node_rec {
-	int			id;
 	int			dbversion;
 	char			name[TARGET_NAME_MAXLEN];
 	char			transport_name[ISCSI_TRANSPORT_NAME_MAXLEN];