[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[Cluster-devel] conga ./autogen.sh ./download_files ricci/conf ...



CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe sourceware org	2007-09-20 06:22:46

Modified files:
	.              : autogen.sh download_files 
	ricci          : configure 
	ricci/ricci    : Auth.cpp Auth.h ClientInstance.cpp 
	                 ClientInstance.h DBusController.cpp 
	                 DBusController.h QueueLocker.cpp QueueLocker.h 
	                 RebootModule.cpp RebootModule.h Ricci.cpp 
	                 Ricci.h RicciWorker.cpp RicciWorker.h 
	                 SSLInstance.cpp SSLInstance.h Server.cpp 
	                 Server.h dbus_test.cpp main.cpp ricci_defines.h 

Log message:
	- Use SHA512 instead of MD5 to verify downloaded tarballs
	- Cleanup the copyright notices in the ricci code.

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/autogen.sh.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/download_files.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/configure.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.h.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/ClientInstance.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/ClientInstance.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&r1=1.16&r2=1.17
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/QueueLocker.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/QueueLocker.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/RebootModule.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/RebootModule.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.28&r2=1.29
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.h.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/RicciWorker.cpp.diff?cvsroot=cluster&r1=1.14&r2=1.15
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/RicciWorker.h.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/SSLInstance.cpp.diff?cvsroot=cluster&r1=1.11&r2=1.12
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/SSLInstance.h.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Server.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Server.h.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/dbus_test.cpp.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/main.cpp.diff?cvsroot=cluster&r1=1.6&r2=1.7
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/ricci_defines.h.diff?cvsroot=cluster&r1=1.9&r2=1.10

--- conga/autogen.sh	2007/09/20 05:52:55	1.6
+++ conga/autogen.sh	2007/09/20 06:22:45	1.7
@@ -28,7 +28,7 @@
 get_and_verify_archive()
 {
 	NAME=$1
-	MD5SUM=$2
+	SHA512SUM=$2
 	shift 2
 	URLs=$@
 
@@ -41,12 +41,12 @@
 				echo "Downloading $NAME from $url"
 				wget $url
 				if [ "$?" = "0" ] ; then
-					echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+					echo "$SHA512SUM  $NAME" | /usr/bin/sha512sum --check --status >/dev/null 2>/dev/null
 					if [ "$?" = "0" ] ; then
-						echo "$NAME passed md5sum test"
+						echo "$NAME passed sha512sum test"
 						done="true"
 					else
-						echo "$NAME failed md5sum test"
+						echo "$NAME failed sha512sum test"
 						rm -f $NAME
 						echo "Trying next mirror in the list..."
 					fi
@@ -62,11 +62,11 @@
 			exit 5
 		fi
 	else
-		echo "$MD5SUM  $NAME" | /usr/bin/md5sum --check --status >/dev/null 2>/dev/null
+		echo "$SHA512SUM  $NAME" | /usr/bin/sha512sum --check --status >/dev/null 2>/dev/null
 		if [ "$?" = "0" ] ; then
-			echo "$NAME passed md5sum test"
+			echo "$NAME passed sha512sum test"
 		else
-			echo "$NAME failed md5sum test; remove it and try again"
+			echo "$NAME failed sha512sum test; remove it and try again"
 			exit 6
 		fi
 	fi
@@ -75,11 +75,11 @@
 if [ "$INCLUDE_ZOPE_PLONE" = "yes" ] ; then
 	get_and_verify_archive \
 	$ZOPE_ARCHIVE_TAR \
-	$ZOPE_MD5SUM \
+	$ZOPE_SHA512SUM \
 	$ZOPE_URLs
 	get_and_verify_archive \
 	$PLONE_ARCHIVE_TAR \
-	$PLONE_MD5SUM \
+	$PLONE_SHA512SUM \
 	$PLONE_URLs
 fi
 
--- conga/download_files	2007/08/20 16:33:31	1.9
+++ conga/download_files	2007/09/20 06:22:45	1.10
@@ -3,13 +3,12 @@
 
 ZOPE_ARCHIVE=Zope-2.9.8-final
 ZOPE_ARCHIVE_TAR=Zope-2.9.8-final.tgz
-ZOPE_MD5SUM=ad7acd2378568264cc301657ee79d361
+ZOPE_SHA512SUM=8fb9cf2e29ad6ee262ee397534ef4501b9521db49cdb33e9edc1d502ed2ee071ceef8efbc8e5216dd5e0176d33a6c56e38bc2645761b2f7f93249aa68f82f541
 ZOPE_URLs="http://www.zope.org/Products/Zope/2.9.8/Zope-2.9.8-final.tgz";
 
-
 PLONE_ARCHIVE=Plone-2.5.3-final
 PLONE_ARCHIVE_TAR=Plone-2.5.3-final.tar.gz
-PLONE_MD5SUM=36117b0757982d66d445b6c6b9df0e25
+PLONE_SHA512SUM=ddb712e3e5da9c94ae4bfea9d84c700cf5a2a19631537e912b0d278021b964fe4510557fe0dbc93b9cb8bd5446385b0ff7c3a7ca0a352c938c4007a12b819cbf
 PLONE_URLs="http://plone.googlecode.com/files/Plone-2.5.3-final.tar.gz \
 	http://superb-west.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
 	http://superb-east.dl.sourceforge.net/sourceforge/plone/Plone-2.5.3-final.tar.gz \
--- conga/ricci/configure	2007/09/11 02:45:26	1.10
+++ conga/ricci/configure	2007/09/20 06:22:46	1.11
@@ -19,13 +19,11 @@
 echo "# configure's params:" >> $MAKE_DEFINES
 for arg in $@
 do
-  var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,`
-  var=`echo $var | sed -e s,?=\ /,?=\ \\${DESTDIR}/,`
-  echo $var >> $MAKE_DEFINES
+	var=`echo $arg | sed -e s,^--\\\\\(.*\\\\\)=\\\\\(.*\\\\\),\\\1\ ?=\ \\\2,`
+	var=`echo $var | sed -e s,?=\ /,?=\ \\${DESTDIR}/,`
+	echo $var >> $MAKE_DEFINES
 done
 
-
-
 LIBDIR_SED=\\/lib
 X86_64_TMP=`uname -a | grep x86_64`
 if [ "$X86_64_TMP" ]; then
@@ -38,42 +36,41 @@
 # see modules/cluster/clumon/src/cim-provider/Makefile
 PEGASUS_PLATFORM=$ARCH
 if [ "$ARCH" = "x86_64" ] ; then
-    if [ ! -e /usr/include/Pegasus/Common/Platform_LINUX_X86_64_GNU.h ] ; then
-	PEGASUS_PLATFORM="ia64"
-    fi
+	if [ ! -e /usr/include/Pegasus/Common/Platform_LINUX_X86_64_GNU.h ] ; then
+		PEGASUS_PLATFORM="ia64"
+	fi
 fi
 
 
 # D-BUS version
 DBUS_VERSION=`pkg-config --modversion dbus-1 2>/dev/null`
 if [ -z "$DBUS_VERSION" ] ; then
-    echo "D-BUS required, but I am unable to locate it. Is it installed?"
-    rm -f $MAKE_DEFINES
-    exit 1
-else
-    echo -n "D-BUS version $DBUS_VERSION detected"
-    VERSIONS=(`echo $DBUS_VERSION | sed -e s,^\\\\\([0123456789]*\\\\\)\.\\\\\([0123456789]*\\\\\).*,\\\1\ \\\2, 2>/dev/null`)
-    DBUS_MAJOR_VERSION=${VERSIONS[0]}
-    DBUS_MINOR_VERSION=${VERSIONS[1]}
-    if [ -z "$DBUS_MAJOR_VERSION" ] ; then
-	echo "; failed extraction of major D-BUS version"
+	echo "D-BUS required, but I am unable to locate it. Is it installed?"
 	rm -f $MAKE_DEFINES
 	exit 1
-    fi
-    if [ -z "$DBUS_MINOR_VERSION" ] ; then
-	echo "; failed extraction of minor D-BUS version"
-	rm -f $MAKE_DEFINES
-	exit 1
-    fi
-    echo '  ->' major $DBUS_MAJOR_VERSION, minor $DBUS_MINOR_VERSION
+else
+	echo -n "D-BUS version $DBUS_VERSION detected"
+	VERSIONS=(`echo $DBUS_VERSION | sed -e s,^\\\\\([0123456789]*\\\\\)\.\\\\\([0123456789]*\\\\\).*,\\\1\ \\\2, 2>/dev/null`)
+	DBUS_MAJOR_VERSION=${VERSIONS[0]}
+	DBUS_MINOR_VERSION=${VERSIONS[1]}
+	if [ -z "$DBUS_MAJOR_VERSION" ] ; then
+		echo "; failed extraction of major D-BUS version"
+		rm -f $MAKE_DEFINES
+		exit 1
+	fi
+	if [ -z "$DBUS_MINOR_VERSION" ] ; then
+		echo "; failed extraction of minor D-BUS version"
+		rm -f $MAKE_DEFINES
+		exit 1
+	fi
+	echo '  ->' major $DBUS_MAJOR_VERSION, minor $DBUS_MINOR_VERSION
 fi
 
-
 cat $MAKE_DEFINES.in \
-    | sed -e s,@@LIBDIR@@,$LIBDIR_SED,g \
-    | sed -e s,@@ARCH@@,$ARCH,g \
-    | sed -e s,@@DBUS_VERSION@@,$DBUS_VERSION,g \
-    | sed -e s,@@DBUS_MAJOR_VERSION@@,$DBUS_MAJOR_VERSION,g \
-    | sed -e s,@@DBUS_MINOR_VERSION@@,$DBUS_MINOR_VERSION,g \
-    | sed -e s,@@PEGASUS_PLATFORM@@,$PEGASUS_PLATFORM,g \
-    >> $MAKE_DEFINES
+	| sed -e s,@@LIBDIR@@,$LIBDIR_SED,g \
+	| sed -e s,@@ARCH@@,$ARCH,g \
+	| sed -e s,@@DBUS_VERSION@@,$DBUS_VERSION,g \
+	| sed -e s,@@DBUS_MAJOR_VERSION@@,$DBUS_MAJOR_VERSION,g \
+	| sed -e s,@@DBUS_MINOR_VERSION@@,$DBUS_MINOR_VERSION,g \
+	| sed -e s,@@PEGASUS_PLATFORM@@,$PEGASUS_PLATFORM,g \
+	>> $MAKE_DEFINES
--- conga/ricci/ricci/Auth.cpp	2007/08/30 17:07:14	1.6
+++ conga/ricci/ricci/Auth.cpp	2007/09/20 06:22:46	1.7
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Auth.h"
 #include "Mutex.h"
 #include <sasl/sasl.h>
@@ -51,7 +50,6 @@
 Auth::~Auth()
 {}
 
-
 bool
 Auth::authenticate(const String& passwd) const
 {
--- conga/ricci/ricci/Auth.h	2007/08/30 17:07:14	1.4
+++ conga/ricci/ricci/Auth.h	2007/09/20 06:22:46	1.5
@@ -1,32 +1,30 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef Auth_h
-#define Auth_h
+#ifndef __CONGA_RICCI_AUTH_H
+#define __CONGA_RICCI_AUTH_H
 
 #include "String.h"
 
-
 // thread safe
 
 class Auth
@@ -40,4 +38,4 @@
 		static bool initialize_auth_system();
 };
 
-#endif // Auth_h
+#endif
--- conga/ricci/ricci/ClientInstance.cpp	2007/09/09 01:06:15	1.10
+++ conga/ricci/ricci/ClientInstance.cpp	2007/09/20 06:22:46	1.11
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "ClientInstance.h"
 #include "Time.h"
 #include "XML.h"
@@ -30,7 +29,6 @@
 
 #include <iostream>
 
-
 using namespace std;
 
 #define ACCEPT_TIMEOUT		30	// seconds
@@ -154,7 +152,6 @@
 	}
 }
 
-
 XMLObject
 ClientInstance::receive()
 {
--- conga/ricci/ricci/ClientInstance.h	2007/08/30 17:07:14	1.3
+++ conga/ricci/ricci/ClientInstance.h	2007/09/20 06:22:46	1.4
@@ -1,28 +1,28 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
 
-#ifndef ClientInstance_h
-#define ClientInstance_h
+#ifndef __CONGA_RICCI_CLIENTINSTANCE_H
+#define __CONGA_RICCI_CLIENTINSTANCE_H
 
 #include "DBusController.h"
 #include "Socket.h"
@@ -52,4 +52,4 @@
 		void encrypt_begin();
 };
 
-#endif // ClientInstance_h
+#endif
--- conga/ricci/ricci/DBusController.cpp	2007/08/30 17:07:14	1.16
+++ conga/ricci/ricci/DBusController.cpp	2007/09/20 06:22:46	1.17
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "DBusController.h"
 #include "Mutex.h"
 #include "utils.h"
@@ -31,17 +30,14 @@
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
 
-
 using namespace std;
 
-
 #define DBUS_TIMEOUT	2147483647 // milliseconds
 
 static DBusConnection *_dbus_conn = NULL;
 static Mutex _dbus_mutex;
 static int _object_counter = 0;
 
-
 DBusController::DBusController()
 {
 	// TODO: dynamically determine,
--- conga/ricci/ricci/DBusController.h	2007/08/30 17:07:14	1.7
+++ conga/ricci/ricci/DBusController.h	2007/09/20 06:22:46	1.8
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef DBusController_h
-#define DBusController_h
+#ifndef __CONGA_RICCI_DBUSCONTROLLER_H
+#define __CONGA_RICCI_DBUSCONTROLLER_H
 
 #include "XML.h"
 #include "String.h"
@@ -44,4 +43,4 @@
 		std::map<String, String> _mod_map;
 };
 
-#endif // DBusController_h
+#endif
--- conga/ricci/ricci/QueueLocker.cpp	2007/08/30 17:07:14	1.4
+++ conga/ricci/ricci/QueueLocker.cpp	2007/09/20 06:22:46	1.5
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "QueueLocker.h"
 #include "ricci_defines.h"
 
@@ -28,10 +27,9 @@
 #include <sys/file.h>
 #include <errno.h>
 
-
 #include "String.h"
-using namespace std;
 
+using namespace std;
 
 static Mutex q_lock;
 static int q_counter = 0;
--- conga/ricci/ricci/QueueLocker.h	2007/08/30 17:07:14	1.2
+++ conga/ricci/ricci/QueueLocker.h	2007/09/20 06:22:46	1.3
@@ -1,32 +1,30 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef QueueLocker_h
-#define QueueLocker_h
+#ifndef __CONGA_RICCI_QUEUELOCKER_H
+#define __CONGA_RICCI_QUEUELOCKER_H
 
 #include "Mutex.h"
 
-
 class QueueLocker : public MutexLocker
 {
 	public:
@@ -34,5 +32,4 @@
 		virtual ~QueueLocker();
 };
 
-
-#endif // QueueLocker_h
+#endif
--- conga/ricci/ricci/RebootModule.cpp	2007/08/30 17:07:14	1.2
+++ conga/ricci/ricci/RebootModule.cpp	2007/09/20 06:22:46	1.3
@@ -1,41 +1,36 @@
 /*
-  Copyright Red Hat, Inc. 2006-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "RebootModule.h"
 
-
 using namespace std;
 
 // potential bug, if there are two different dbuss in use
 static DBusController* dbus = NULL;
 static bool block = false;
 
-
 static VarMap reboot(const VarMap& args);
-
 static ApiFcnMap build_fcn_map();
 
-
 RebootModule::RebootModule(DBusController& dbus) :
 	Module(build_fcn_map()),
 	_dbus(dbus)
--- conga/ricci/ricci/RebootModule.h	2007/08/30 17:07:14	1.2
+++ conga/ricci/ricci/RebootModule.h	2007/09/20 06:22:46	1.3
@@ -1,33 +1,31 @@
 /*
-  Copyright Red Hat, Inc. 2006-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2006-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef RebootModule_h
-#define RebootModule_h
+#ifndef __CONGA_RICCI_REBOOTMODULE_H
+#define __CONGA_RICCI_REBOOTMODULE_H
 
 #include "Module.h"
 #include "DBusController.h"
 
-
 class RebootModule : public Module
 {
 	public:
@@ -40,5 +38,4 @@
 		DBusController& _dbus;
 };
 
-
-#endif // RebootModule_h
+#endif
--- conga/ricci/ricci/Ricci.cpp	2007/09/11 00:26:52	1.28
+++ conga/ricci/ricci/Ricci.cpp	2007/09/20 06:22:46	1.29
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Ricci.h"
 #include "Auth.h"
 #include "utils.h"
@@ -44,6 +43,7 @@
 }
 
 #include <fstream>
+
 using namespace std;
 
 static bool dom0();
--- conga/ricci/ricci/Ricci.h	2007/08/30 17:07:14	1.9
+++ conga/ricci/ricci/Ricci.h	2007/09/20 06:22:46	1.10
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef Ricci_h
-#define Ricci_h
+#ifndef __CONGA_RICCI_H
+#define __CONGA_RICCI_H
 
 #include "DBusController.h"
 #include "XML.h"
@@ -59,8 +58,7 @@
 		DBusController& _dbus;
 		int _fail_auth_attempt;
 		XMLObject ricci_header(bool authed, bool full=false) const;
-}; // class Ricci
-
+};
 
 class Batch
 {
@@ -73,7 +71,8 @@
 		virtual bool done() const;
 		virtual XMLObject report() const;
 
-		static void restart_batches(); // start workers on existing batch files
+		// start workers on existing batch files
+		static void restart_batches();
 
 	private:
 		XMLObject _report;
@@ -85,6 +84,6 @@
 
 		Batch(const Batch&);
 		Batch& operator=(const Batch&);
-}; // class Batch
+};
 
-#endif // Ricci_h
+#endif
--- conga/ricci/ricci/RicciWorker.cpp	2007/09/11 00:26:52	1.14
+++ conga/ricci/ricci/RicciWorker.cpp	2007/09/20 06:22:46	1.15
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "RicciWorker.h"
 #include "utils.h"
 #include "QueueLocker.h"
@@ -40,8 +39,8 @@
 }
 
 #include <iostream>
-using namespace std;
 
+using namespace std;
 
 void
 usage(const char *progname)
--- conga/ricci/ricci/RicciWorker.h	2007/08/30 17:07:14	1.7
+++ conga/ricci/ricci/RicciWorker.h	2007/09/20 06:22:46	1.8
@@ -1,38 +1,35 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef RicciWorker_h
-#define RicciWorker_h
+#ifndef __CONGA_RICCI_RICCIWORKER_H
+#define __CONGA_RICCI_RICCIWORKER_H
 
 #include "DBusController.h"
 #include "XML.h"
 #include "counting_auto_ptr.h"
 #include "RebootModule.h"
 
-
 class BatchWorker;
 
-
 class ProcessWorker
 {
 	public:
@@ -104,4 +101,4 @@
 	friend class ProcessWorker;
 };
 
-#endif // RicciWorker_h
+#endif
--- conga/ricci/ricci/SSLInstance.cpp	2007/09/11 00:26:52	1.11
+++ conga/ricci/ricci/SSLInstance.cpp	2007/09/20 06:22:46	1.12
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "SSLInstance.h"
 #include "Mutex.h"
 #include "ricci_defines.h"
@@ -46,7 +45,6 @@
 using namespace std;
 
 
-
 static Mutex global_lock;
 static bool ssl_inited = false;
 static SSL_CTX* ctx = 0;
--- conga/ricci/ricci/SSLInstance.h	2007/08/30 17:07:14	1.6
+++ conga/ricci/ricci/SSLInstance.h	2007/09/20 06:22:46	1.7
@@ -1,38 +1,35 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef SSLInstance_h
-#define SSLInstance_h
+#ifndef __CONGA_RICCI_SSLINSTANCE_H
+#define __CONGA_RICCI_SSLINSTANCE_H
 
 #include "Socket.h"
 
 #include "String.h"
 #include <openssl/ssl.h>
 
-
 // NOT THREAD SAFE
 
-
 class SSLInstance
 {
 	public:
@@ -64,6 +61,6 @@
 
 		bool _accepted;
 		void check_error(int value, bool& want_read, bool& want_write);
-}; // class SSLInstance
+};
 
-#endif // SSLInstance_h
+#endif
--- conga/ricci/ricci/Server.cpp	2007/09/09 01:06:15	1.8
+++ conga/ricci/ricci/Server.cpp	2007/09/20 06:22:46	1.9
@@ -1,44 +1,40 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Server.h"
 #include "ClientInstance.h"
 #include "Ricci.h"
 
-
 extern "C" {
-#include "signals.h"
-#include <signal.h>
-void daemon_init(char *prog);
-}
-
-
+	#include "signals.h"
+	#include <signal.h>
 
+	void daemon_init(char *prog);
+}
 
 #include <sys/poll.h>
 #include <errno.h>
-typedef struct pollfd poll_fd;
 
+typedef struct pollfd poll_fd;
 
 #include <list>
 #include <iostream>
--- conga/ricci/ricci/Server.h	2007/08/30 17:07:14	1.3
+++ conga/ricci/ricci/Server.h	2007/09/20 06:22:46	1.4
@@ -1,28 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef Server_h
-#define Server_h
+#ifndef __CONGA_RICCI_SERVER_H
+#define __CONGA_RICCI_SERVER_H
 
 #include "Socket.h"
 #include "DBusController.h"
@@ -40,4 +39,4 @@
 		DBusController _dbus_controller;
 };
 
-#endif // Server_h
+#endif
--- conga/ricci/ricci/dbus_test.cpp	2007/08/30 17:07:14	1.5
+++ conga/ricci/ricci/dbus_test.cpp	2007/09/20 06:22:46	1.6
@@ -1,4 +1,20 @@
-
+/*
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
+*/
 
 #define DBUS_API_SUBJECT_TO_CHANGE
 #include <dbus/dbus.h>
@@ -10,52 +26,48 @@
 
 int main(int argc, char **argv)
 {
-  DBusConnection* conn = dbus_bus_get(DBUS_BUS_SYSTEM,
-				      NULL);
-
-  DBusMessage* msg = dbus_message_new_method_call("com.redhat.ricci",
-						  "/com/redhat/ricci",
-						  "com.redhat.ricci",
-						  "modlog_rw");
-
-  cout << "max msg size: " << dbus_connection_get_max_message_size(conn) << endl;
-
-  // construct xml request
-  String xml = "<?xml version=\"1.0\" ?>";
-  xml += "<request sequence=\"1254\">";
-  xml += "<function_call name=\"get_cluster.conf\">";
-  xml += "</function_call>";
-  xml += "</request>";
-
-  dbus_message_append_args(msg,
-			   DBUS_TYPE_STRING, xml.c_str(),
-			   DBUS_TYPE_INVALID);
-
-  DBusError error;
-  dbus_error_init (&error);
-  DBusMessage *resp = dbus_connection_send_with_reply_and_block(conn,
-								msg,
-								100000,
-								&error);
-  dbus_message_unref(msg);
-
-  if (resp) {
-    int status;
-    char* out;
-    char* err;
-    dbus_message_get_args(resp,
-			  NULL,
-			  DBUS_TYPE_INT32, &status,
-			  DBUS_TYPE_STRING, &out,
-			  DBUS_TYPE_STRING, &err);
-
-    cout << "status: " << status << endl;
-    cout << "out: " << out << endl;
-    cout << "out size: " << String(out).size() << endl;
-    cout << "err: " << err << endl;
-
-    dbus_message_unref(resp);
-  } else
-    cout << "error: " << error.message << endl;
+	DBusConnection *conn = dbus_bus_get(DBUS_BUS_SYSTEM, NULL);
 
+	DBusMessage *msg = dbus_message_new_method_call("com.redhat.ricci",
+							"/com/redhat/ricci",
+							"com.redhat.ricci",
+							"modlog_rw");
+
+	cout << "max msg size: ";
+	cout << dbus_connection_get_max_message_size(conn) << endl;
+
+	// construct xml request
+	String xml = "<?xml version=\"1.0\" ?>";
+	xml += "<request sequence=\"1254\">";
+	xml += "<function_call name=\"get_cluster.conf\">";
+	xml += "</function_call>";
+	xml += "</request>";
+
+	dbus_message_append_args(msg,
+		DBUS_TYPE_STRING, xml.c_str(), DBUS_TYPE_INVALID);
+
+	DBusError error;
+	dbus_error_init(&error);
+	DBusMessage *resp = dbus_connection_send_with_reply_and_block(conn,
+							msg, 100000, &error);
+	dbus_message_unref(msg);
+
+	if (resp) {
+		int status;
+		char *out;
+		char *err;
+
+		dbus_message_get_args(resp, NULL,
+			DBUS_TYPE_INT32, &status,
+			DBUS_TYPE_STRING, &out,
+			DBUS_TYPE_STRING, &err);
+
+		cout << "status: " << status << endl;
+		cout << "out: " << out << endl;
+		cout << "out size: " << String(out).size() << endl;
+		cout << "err: " << err << endl;
+
+		dbus_message_unref(resp);
+	} else
+		cout << "error: " << error.message << endl;
 }
--- conga/ricci/ricci/main.cpp	2007/09/11 02:45:28	1.6
+++ conga/ricci/ricci/main.cpp	2007/09/20 06:22:46	1.7
@@ -1,26 +1,25 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
 #include "Server.h"
 #include "ricci_defines.h"
 
--- conga/ricci/ricci/ricci_defines.h	2007/08/30 17:07:14	1.9
+++ conga/ricci/ricci/ricci_defines.h	2007/09/20 06:22:46	1.10
@@ -1,29 +1,27 @@
 /*
-  Copyright Red Hat, Inc. 2005-2007
-
-  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; either version 2, or (at your option) any
-  later version.
-
-  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; see the file COPYING.  If not, write to the
-  Free Software Foundation, Inc.,  675 Mass Ave, Cambridge,
-  MA 02139, USA.
+** Copyright (C) Red Hat, Inc. 2005-2007
+**
+** This program is free software; you can redistribute it and/or modify it
+** under the terms of the GNU General Public License version 2 as
+** published by the Free Software Foundation.
+**
+** 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; see the file COPYING. If not, write to the
+** Free Software Foundation, Inc., 675 Mass Ave, Cambridge,
+** MA 02139, USA.
 */
+
 /*
  * Author: Stanko Kupcevic <kupcevic redhat com>
  */
 
-
-#ifndef ricci_defines_h
-#define ricci_defines_h
-
+#ifndef __CONGA_RICCI_DEFINES_H
+#define __CONGA_RICCI_DEFINES_H
 
 #define RICCI_SERVER_PORT		11111
 
@@ -38,4 +36,4 @@
 #define AUTH_HELPER_PATH		"/usr/libexec/ricci/ricci-auth"
 #define RICCI_WORKER_PATH		"/usr/libexec/ricci/ricci-worker"
 
-#endif // ricci_defines_h
+#endif


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]