rpms/kismet/devel kismet_capture_wrap.c, NONE, 1.1 kismet_capture.pam, NONE, 1.1 kismet_capture.console, NONE, 1.1 kismet-2009-06-R1-perms.patch, NONE, 1.1 kismet-2009-06-R1-fmt.patch, NONE, 1.1 kismet-2009-06-R1-envp.patch, NONE, 1.1

[ensc]

Author: ensc

Update of /cvs/extras/rpms/kismet/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1592

Added Files:
	kismet_capture_wrap.c kismet_capture.pam 
	kismet_capture.console kismet-2009-06-R1-perms.patch 
	kismet-2009-06-R1-fmt.patch kismet-2009-06-R1-envp.patch 
Log Message:
initial checkin for 2009-06-R1



--- NEW FILE kismet_capture_wrap.c ---
/*	--*- c -*--
 * Copyright (C) 2009 Enrico Scholz <enrico.scholz at informatik.tu-chemnitz.de>
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; version 3 of the License.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */

#include <stdlib.h>
#include <unistd.h>

/* Hack around missing configurability of userhelper which closes all upper
 * fds */
int main(int argc, char *argv[])
{
	int	fd;

	if (argc >= 2) {
		fd = atoi(argv[1]);
		if (fd != 0) {
			if (dup2(fd, 0) < 0)
				abort();
			close(fd);
		}

		argv[1] = "0";
	}

	execv("/usr/bin/consolehelper", argv);
	abort();
}


--- NEW FILE kismet_capture.pam ---
#%PAM-1.0
auth		sufficient	pam_rootok.so
#auth		sufficient	pam_timestamp.so
auth		include		system-auth
account		required	pam_permit.so
session		required	pam_permit.so
session		optional	pam_xauth.so
#session	optional	pam_timestamp.so


--- NEW FILE kismet_capture.console ---
USER=root
PROGRAM=/usr/libexec/kismet_capture
SESSION=true
FALLBACK=false

kismet-2009-06-R1-perms.patch:
 Makefile.in |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE kismet-2009-06-R1-perms.patch ---
Index: kismet-2009-06-R1/Makefile.in
===================================================================
--- kismet-2009-06-R1.orig/Makefile.in
+++ kismet-2009-06-R1/Makefile.in
@@ -127,16 +127,16 @@ Makefile: Makefile.in configure
 	@-echo "'Makefile.in' or 'configure' are more current than this Makefile.  You should re-run 'configure'."
 
 binsuidinstall:
-	$(INSTALL) -o $(INSTUSR) -g $(SUIDGROUP) -m 4550 $(CS) $(BIN)/$(CS); 
+	$(INSTALL) -o $(INSTUSR) -g $(SUIDGROUP) -m 4750 $(CS) $(BIN)/$(CS); 
 	
 commoninstall:
 	mkdir -p $(ETC)
 	mkdir -p $(BIN)
 
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 scripts/kismet $(BIN)/kismet
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(NC) $(BIN)/$(NC)
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(PS) $(BIN)/$(PS); 
-	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 555 $(DRONE) $(BIN)/$(DRONE);
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 scripts/kismet $(BIN)/kismet
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(NC) $(BIN)/$(NC)
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(PS) $(BIN)/$(PS); 
+	$(INSTALL) -o $(INSTUSR) -g $(INSTGRP) -m 755 $(DRONE) $(BIN)/$(DRONE);
 
 	mkdir -p $(MAN)/man1
 	$(INSTALL) -o $(INSTUSR) -g $(MANGRP) -m 644 man/kismet.1 $(MAN)/man1/kismet.1

kismet-2009-06-R1-fmt.patch:
 kis_panel_network.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-06-R1-fmt.patch ---
Index: kismet-2009-06-R1/kis_panel_network.cc
===================================================================
--- kismet-2009-06-R1.orig/kis_panel_network.cc
+++ kismet-2009-06-R1/kis_panel_network.cc
@@ -2481,7 +2481,7 @@ int Kis_Netlist::PrintNetworkLine(Kis_Di
 			rofft += 4;
 		} else if (b == bcol_clients) {
 			// TODO - handle clients
-			snprintf(rline + rofft, max - rofft, "%4d", net->client_map.size());
+			snprintf(rline + rofft, max - rofft, "%4zd", net->client_map.size());
 			rofft += 4;
 		} else if (b == bcol_datasize) {
 			char dt = ' ';

kismet-2009-06-R1-envp.patch:
 ipc_remote.cc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE kismet-2009-06-R1-envp.patch ---
Preserve environment when calling the kismet_capture client. We need
stuff like $DISPLAY or $XAUTHORITY to display the consolehelper dialog.

Index: kismet-2009-06-R1/ipc_remote.cc
===================================================================
--- kismet-2009-06-R1.orig/ipc_remote.cc
+++ kismet-2009-06-R1/ipc_remote.cc
@@ -323,7 +323,7 @@ int IPCRemote::SpawnIPC() {
 
 				snprintf(cmdarg[1], 4, "%d", sockpair[0]);
 
-				if (execve(cmdarg[0], cmdarg, NULL) < 0) {
+				if (execve(cmdarg[0], cmdarg, globalreg->envp) < 0) {
 					int status = errno;
 					fprintf(stderr, "Failed to exec as IPC child: %s\n", 
 							strerror(status));