--- ansh/src/anshd.c	2011/10/10 09:11:48	1.1.1.1.2.2
+++ ansh/src/anshd.c	2011/10/10 13:56:30	1.1.1.1.2.3
@@ -3,7 +3,7 @@
  *  by Michael Pounov <misho@elwix.org>
  *
  * $Author: misho $
- * $Id: anshd.c,v 1.1.1.1.2.2 2011/10/10 09:11:48 misho Exp $
+ * $Id: anshd.c,v 1.1.1.1.2.3 2011/10/10 13:56:30 misho Exp $
  *
  *************************************************************************/
 #include "global.h"
@@ -26,7 +26,6 @@ Usage()
 		"=== %s === %s@%s ===\n\n"
 		" Syntax: anshd [options]\n\n"
 		"\t-d <dev>\tBind to host interface, like 'em0' (default is first host interface)\n"
-		"\t-i <id>\tService ID (default is 42)\n"
 		"\t-U <user>\tRun service with other user\n"
 		"\t-C <dir>\tRun service into chroot directory\n"
 		"\t-t <timeout>\tTimeout of login if no activity (default is 0 sec)\n"
@@ -79,7 +78,6 @@ main(int argc, char **argv)
 {
 	struct passwd *pass;
 	int fd, h = 0, uid = 0, gid = 0;
-	long id = ANSH_ID;
 	char ch, szUser[STRSIZ] = "root", szChroot[STRSIZ] = "/", szDev[STRSIZ] = { 0 };
 	struct sigaction sact;
 	sched_root_task_t *root = NULL;
@@ -87,7 +85,7 @@ main(int argc, char **argv)
 
 	Get1stEth(szDev, STRSIZ);
 
-	while ((ch = getopt(argc, argv, "hvubt:d:i:U:C:")) != -1)
+	while ((ch = getopt(argc, argv, "hvubt:d:U:C:")) != -1)
 		switch (ch) {
 			case 'U':
 				pass = getpwnam(optarg);
@@ -108,9 +106,6 @@ main(int argc, char **argv)
 				} else
 					strlcpy(szChroot, optarg, sizeof szChroot);
 				break;
-			case 'i':
-				id = strtol(optarg, NULL, 0);
-				break;
 			case 't':
 				Timeout = abs(strtol(optarg, NULL, 0));
 				break;
@@ -187,7 +182,7 @@ main(int argc, char **argv)
 	}
 
 	SLIST_INIT(&pH);
-	if (!(proc = InitProc(h, NULL, id, bpfLEN))) {
+	if (!(proc = InitProc(h, NULL, ANSH_ID, bpfLEN))) {
 		ERR("Error:: Not enough memory ...\n");
 		close(h);
 		unlink(PIDFILE_ANSHD);
@@ -198,7 +193,7 @@ main(int argc, char **argv)
 	root = schedBegin();
 	if (!root) {
 		ERR("Scheduler not init #%d - %s\n", sched_GetErrno(), sched_GetError());
-		DestroyProc(id);
+		DestroyProc(ANSH_ID);
 		close(h);
 		unlink(PIDFILE_ANSHD);
 		closelog();
@@ -212,14 +207,14 @@ main(int argc, char **argv)
 	setgid(gid);
 	setuid(uid);
 
-	if (schedRead(root, pktRx, (void*) id, h)) {
+	if (schedRead(root, pktRx, (void*) ANSH_ID, h)) {
 		schedRun(root, &Kill);
 	} else
 		ERR("Failed to add reader task #%d - %s\n", sched_GetErrno(), sched_GetError());
 
 	VERB(1) LOG("Finish process.");
 	schedEnd(&root);
-	DestroyProc(id);
+	DestroyProc(ANSH_ID);
 	close(h);
 	unlink(PIDFILE_ANSHD);
 	closelog();