* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2006-10-24 21:59 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-24 21:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: kupcevic at sourceware.org 2006-10-24 21:59:55
Modified files:
. : conga.spec.in.in
make : version.in
ricci/init.d : ricci
ricci/ricci : Auth.cpp Auth.h Makefile
Log message:
ricci: switch pam to sasl authentication (bz211191)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45&r2=1.45.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21&r2=1.21.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/ricci.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.8&r2=1.8.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.4&r2=1.4.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.h.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.2&r2=1.2.2.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.16&r2=1.16.2.1
--- conga/conga.spec.in.in 2006/10/16 21:01:40 1.45
+++ conga/conga.spec.in.in 2006/10/24 21:59:55 1.45.2.1
@@ -40,7 +40,10 @@
BuildRequires: python-devel >= 2.4.1
%endif
BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig file
+#BuildRequires: pam-devel
+BuildRequires: cyrus-sasl-devel >= 2.1
+BuildRequires: openssl-devel dbus-devel pkgconfig file
+
%description
Conga is a project developing management system for remote stations.
@@ -182,7 +185,7 @@
Summary: Remote Management System - Managed Station
Requires: initscripts
-Requires: oddjob dbus openssl pam
+Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
Requires: sed util-linux
Requires: modcluster >= 0.8
@@ -279,6 +282,7 @@
%changelog
+
* Wed Oct 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-20
- Minor GUI nits
--- conga/make/version.in 2006/10/16 21:01:40 1.21
+++ conga/make/version.in 2006/10/24 21:59:55 1.21.2.1
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=20
+RELEASE=20.4
--- conga/ricci/init.d/ricci 2006/08/16 02:57:52 1.8
+++ conga/ricci/init.d/ricci 2006/10/24 21:59:55 1.8.2.1
@@ -90,6 +90,8 @@
fi
fi
+ service saslauthd start > /dev/null 2>&1
+
ssl_certs_ok
if [ "1$?" != "10" ] ; then
generate_ssl_certs
--- conga/ricci/ricci/Auth.cpp 2006/08/12 00:38:36 1.4
+++ conga/ricci/ricci/Auth.cpp 2006/10/24 21:59:55 1.4.2.1
@@ -22,33 +22,35 @@
#include "Auth.h"
-#include "ricci_defines.h"
+#include "Mutex.h"
+#include <sasl/sasl.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <iostream>
-using namespace std;
+static int
+sasl_getopts_callback(void* context,
+ const char* plugin_name,
+ const char* option,
+ const char** result,
+ unsigned int* len);
-static void
-close_fd(int fd)
-{
- int e;
- do {
- e = close(fd);
- } while (e && (errno == EINTR));
-}
+static Mutex mutex; // global sasl_lib protection mutex
+static bool inited = false; // sasl_lib initialized?
+const static
+sasl_callback_t callbacks[] = {
+ {SASL_CB_GETOPT, (int (*)()) sasl_getopts_callback, NULL},
+ {SASL_CB_LIST_END, NULL, NULL},
+};
-Auth::Auth() :
- _path(AUTH_HELPER_PATH)
-{}
+Auth::Auth()
+{
+ if (!initialize_auth_system())
+ throw String("Failed to initialize authentication engine");
+}
Auth::~Auth()
{}
@@ -57,77 +59,87 @@
bool
Auth::authenticate(const String& passwd) const
{
- if (access(_path.c_str(), X_OK))
- throw String("missing auth helper");
+ MutexLocker l(mutex);
- int _stdin_pipe[2];
-
- if (pipe(_stdin_pipe) == -1)
- throw String("failure creating pipe");
-
- int pid = fork();
- if (pid == -1) {
- close_fd(_stdin_pipe[0]);
- close_fd(_stdin_pipe[1]);
- throw String("fork failed");
+ sasl_conn_t *conn = 0;
+ try {
+ bool success = false;
+
+ int ret = sasl_server_new("ricci", // servicename
+ NULL, // hostname
+ NULL, // realm
+ NULL, // local ip:port
+ NULL, // remote ip:port
+ callbacks,
+ 0, // connection flags
+ &conn);
+ if (ret != SASL_OK)
+ throw String("authentication engine error");
+
+ ret = sasl_checkpass(conn,
+ "root", 4,
+ passwd.c_str(), passwd.size());
+ if (ret == SASL_OK)
+ success = true;
+ else
+ if (ret != SASL_BADAUTH)
+ throw String("authentication engine error");
+
+ sasl_dispose(&conn); conn = 0;
+ return success;
+ } catch ( ... ) {
+ if (conn) {
+ sasl_dispose(&conn);
+ conn = 0;
+ }
+ throw;
}
+}
+
+
+
+bool
+Auth::initialize_auth_system()
+{
+ MutexLocker l(mutex);
- if (pid == 0) {
- /* child */
- close_fd(0);
- close_fd(1);
- close_fd(2);
-
- close_fd(_stdin_pipe[1]);
- dup2(_stdin_pipe[0], 0);
- close_fd(_stdin_pipe[0]);
-
- // restore signals
- for (int x = 1; x < _NSIG; x++)
- signal(x, SIG_DFL);
- sigset_t set;
- sigfillset(&set);
- sigprocmask(SIG_UNBLOCK, &set, NULL);
-
- /* exec */
- execl(_path.c_str(), _path.c_str(), NULL);
- _exit(1);
+ if (!inited) {
+ int ret = sasl_server_init(callbacks, "ricci");
+ inited = (ret == SASL_OK);
}
-
-
- /* parent */
-
- close_fd(_stdin_pipe[0]);
-
+ return inited;
+}
+
+int
+sasl_getopts_callback(void* context,
+ const char* plugin_name,
+ const char* option,
+ const char** result,
+ unsigned * len)
+{
try {
- String pass = passwd + "\n";
- do {
- int size = write(_stdin_pipe[1], pass.c_str(), pass.size());
- if (size == -1) {
- if (errno == EINTR)
- continue;
- else {
- cout << errno << endl;
- throw String("write() error");
- }
+ static const char authd_option[] = "pwcheck_method";
+ static const char authd_result[] = "saslauthd";
+
+ static const char authd_version_option[] = "saslauthd_version";
+ static const char authd_version_result[] = "2";
+
+
+ if (result) {
+ *result = 0;
+ if (strcmp(option, authd_option) == 0)
+ *result = authd_result;
+ else if (strcmp(option, authd_version_option) == 0)
+ *result = authd_version_result;
+ else {
+ // modify more options we'd like to use
}
- pass = pass.substr(size, pass.npos);
- } while (!pass.empty());
+ }
+ if (len)
+ *len = 0;
+
+ return SASL_OK;
} catch ( ... ) {
- close_fd(_stdin_pipe[1]);
- throw;
- }
- close_fd(_stdin_pipe[1]);
-
- bool success = false;
- int ret, status;
- do {
- ret = waitpid(pid, &status, 0);
- } while ((ret < 0) && (errno == EINTR));
-
- if (WIFEXITED(status)) {
- status = WEXITSTATUS(status);
- success = (status == 0);
+ return SASL_FAIL;
}
- return success;
}
--- conga/ricci/ricci/Auth.h 2006/08/10 22:53:09 1.2
+++ conga/ricci/ricci/Auth.h 2006/10/24 21:59:55 1.2.2.1
@@ -27,6 +27,9 @@
#include "String.h"
+// thread safe
+
+
class Auth
{
public:
@@ -34,9 +37,10 @@
virtual ~Auth();
bool authenticate(const String& passwd) const;
- private:
- String _path;
+
+ static bool initialize_auth_system(); // to be called@start-up (not required)
+
};
--- conga/ricci/ricci/Makefile 2006/08/22 23:01:17 1.16
+++ conga/ricci/ricci/Makefile 2006/10/24 21:59:55 1.16.2.1
@@ -44,7 +44,8 @@
LDFLAGS += `pkg-config --libs dbus-1`
-all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER}
+#all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER}
+all: ${TARGET} ${TARGET_WORKER}
*.o: *.h ../include/*.h
@@ -52,7 +53,7 @@
$(INSTALL_DIR) ${sbindir}
$(INSTALL_BIN) ${TARGET} ${sbindir}
$(INSTALL_DIR) ${libexecdir}/ricci
- install -m 4755 ${TARGET_AUTH} ${libexecdir}/ricci
+ #install -m 4755 ${TARGET_AUTH} ${libexecdir}/ricci
$(INSTALL_BIN) ${TARGET_WORKER} ${libexecdir}/ricci
$(INSTALL_DIR) ${localstatedir}/lib/ricci/queue
$(INSTALL_DIR) ${localstatedir}/lib/ricci/certs
@@ -77,10 +78,14 @@
$(TARGET): $(OBJECTS)
- $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
+ $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) -lsasl2
${TARGET_AUTH}: $(TARGET_AUTH_OBJECTS)
$(CXX) -o ${TARGET_AUTH} $(TARGET_AUTH_OBJECTS) ${LDFLAGS} -lpam
${TARGET_WORKER}: ${TARGET_WORKER_OBJECTS}
$(CXX) -o ${TARGET_WORKER} ${TARGET_WORKER_OBJECTS} ${LDFLAGS}
+
+
+Auth_test: Auth_test.o Auth.o
+ $(CXX) -o Auth_test Auth_test.o Auth.o ${LDFLAGS} -lsasl2
^ permalink raw reply [flat|nested] 7+ messages in thread* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2008-09-23 17:42 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-09-23 17:42 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2008-09-23 17:42:41
Modified files:
. : conga.spec.in.in
make : version.in
ricci/test_suite: .cvsignore
Log message:
Bump the version to make the build system happy
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.105&r2=1.45.2.106
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.46&r2=1.21.2.47
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/test_suite/.cvsignore.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.1.2.1&r2=1.1.2.2
--- conga/conga.spec.in.in 2008/09/23 17:34:56 1.45.2.105
+++ conga/conga.spec.in.in 2008/09/23 17:42:41 1.45.2.106
@@ -323,6 +323,9 @@
### changelog ###
%changelog
+* Tue Sep 23 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-6
+ - Fix bz463220
+
* Tue Sep 23 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-5
- Fix bz463220
--- conga/make/version.in 2008/09/23 16:05:08 1.21.2.46
+++ conga/make/version.in 2008/09/23 17:42:41 1.21.2.47
@@ -1,2 +1,2 @@
VERSION=0.12.1
-RELEASE=5
+RELEASE=6
--- conga/ricci/test_suite/.cvsignore 2008/01/17 17:38:39 1.1.2.1
+++ conga/ricci/test_suite/.cvsignore 2008/09/23 17:42:41 1.1.2.2
@@ -1,2 +0,0 @@
-cacert.pem
-privkey.pem
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2008-08-27 14:59 rmccabe
0 siblings, 0 replies; 7+ messages in thread
From: rmccabe @ 2008-08-27 14:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Branch: RHEL5
Changes by: rmccabe at sourceware.org 2008-08-27 14:59:18
Modified files:
. : conga.spec.in.in
make : version.in
ricci/ricci : SSLInstance.cpp
Log message:
Update the changelog and bump the version
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.45.2.100&r2=1.45.2.101
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.21.2.44&r2=1.21.2.45
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/SSLInstance.cpp.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.5.2.5&r2=1.5.2.6
--- conga/conga.spec.in.in 2008/08/07 18:07:36 1.45.2.100
+++ conga/conga.spec.in.in 2008/08/27 14:59:17 1.45.2.101
@@ -312,6 +312,10 @@
### changelog ###
%changelog
+* Wed Aug 27 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-4
+- Fix bz459562 (charset configuration fix for luci)
+- Fix bz459469 (An unknown device type was given: "gnbd.")
+
* Thu Aug 07 2008 Ryan McCabe <rmccabe@redhat.com> 0.12.1-3
- More fixes for bz429350
--- conga/make/version.in 2008/08/07 18:08:24 1.21.2.44
+++ conga/make/version.in 2008/08/27 14:59:18 1.21.2.45
@@ -1,2 +1,2 @@
VERSION=0.12.1
-RELEASE=3
+RELEASE=4
--- conga/ricci/ricci/SSLInstance.cpp 2008/08/20 05:01:37 1.5.2.5
+++ conga/ricci/ricci/SSLInstance.cpp 2008/08/27 14:59:18 1.5.2.6
@@ -498,7 +498,7 @@
e = "SSL_ERROR_WANT_X509_LOOKUP";
break;
case SSL_ERROR_SYSCALL:
- if (errno == EAGAIN || errno == EINTR)
+ if (err == EAGAIN || err == EINTR)
return;
e = "SSL_ERROR_SYSCALL";
break;
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2006-10-24 21:54 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-10-24 21:54 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-10-24 21:54:29
Modified files:
. : conga.spec.in.in
make : version.in
ricci/init.d : ricci
ricci/ricci : Auth.cpp Auth.h Makefile
Log message:
ricci: switch pam to sasl authentication (bz211191)
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.45&r2=1.46
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.21&r2=1.22
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/ricci.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.cpp.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Auth.h.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.16&r2=1.17
--- conga/conga.spec.in.in 2006/10/16 21:01:40 1.45
+++ conga/conga.spec.in.in 2006/10/24 21:54:29 1.46
@@ -40,7 +40,10 @@
BuildRequires: python-devel >= 2.4.1
%endif
BuildRequires: glibc-devel gcc-c++ libxml2-devel sed
-BuildRequires: openssl-devel dbus-devel pam-devel pkgconfig file
+#BuildRequires: pam-devel
+BuildRequires: cyrus-sasl-devel >= 2.1
+BuildRequires: openssl-devel dbus-devel pkgconfig file
+
%description
Conga is a project developing management system for remote stations.
@@ -182,7 +185,7 @@
Summary: Remote Management System - Managed Station
Requires: initscripts
-Requires: oddjob dbus openssl pam
+Requires: oddjob dbus openssl pam cyrus-sasl >= 2.1
Requires: sed util-linux
Requires: modcluster >= 0.8
@@ -279,6 +282,7 @@
%changelog
+
* Wed Oct 16 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-20
- Minor GUI nits
--- conga/make/version.in 2006/10/16 21:01:40 1.21
+++ conga/make/version.in 2006/10/24 21:54:29 1.22
@@ -1,2 +1,11 @@
+#VERSION=0.9
+#RELEASE=0_TMP_BUILD___WILL_BE_1
+
+# RELEASE has such a strange format just to make sure
+# people notice that version is not completed
+#
+# after version is ready, replace with real release number
+#
+
VERSION=0.8
-RELEASE=20
+RELEASE=20.4
--- conga/ricci/init.d/ricci 2006/08/16 02:57:52 1.8
+++ conga/ricci/init.d/ricci 2006/10/24 21:54:29 1.9
@@ -90,6 +90,8 @@
fi
fi
+ service saslauthd start > /dev/null 2>&1
+
ssl_certs_ok
if [ "1$?" != "10" ] ; then
generate_ssl_certs
--- conga/ricci/ricci/Auth.cpp 2006/08/12 00:38:36 1.4
+++ conga/ricci/ricci/Auth.cpp 2006/10/24 21:54:29 1.5
@@ -22,33 +22,35 @@
#include "Auth.h"
-#include "ricci_defines.h"
+#include "Mutex.h"
+#include <sasl/sasl.h>
-#include <errno.h>
-#include <signal.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <iostream>
-using namespace std;
+static int
+sasl_getopts_callback(void* context,
+ const char* plugin_name,
+ const char* option,
+ const char** result,
+ unsigned int* len);
-static void
-close_fd(int fd)
-{
- int e;
- do {
- e = close(fd);
- } while (e && (errno == EINTR));
-}
+static Mutex mutex; // global sasl_lib protection mutex
+static bool inited = false; // sasl_lib initialized?
+const static
+sasl_callback_t callbacks[] = {
+ {SASL_CB_GETOPT, (int (*)()) sasl_getopts_callback, NULL},
+ {SASL_CB_LIST_END, NULL, NULL},
+};
-Auth::Auth() :
- _path(AUTH_HELPER_PATH)
-{}
+Auth::Auth()
+{
+ if (!initialize_auth_system())
+ throw String("Failed to initialize authentication engine");
+}
Auth::~Auth()
{}
@@ -57,77 +59,87 @@
bool
Auth::authenticate(const String& passwd) const
{
- if (access(_path.c_str(), X_OK))
- throw String("missing auth helper");
+ MutexLocker l(mutex);
- int _stdin_pipe[2];
-
- if (pipe(_stdin_pipe) == -1)
- throw String("failure creating pipe");
-
- int pid = fork();
- if (pid == -1) {
- close_fd(_stdin_pipe[0]);
- close_fd(_stdin_pipe[1]);
- throw String("fork failed");
+ sasl_conn_t *conn = 0;
+ try {
+ bool success = false;
+
+ int ret = sasl_server_new("ricci", // servicename
+ NULL, // hostname
+ NULL, // realm
+ NULL, // local ip:port
+ NULL, // remote ip:port
+ callbacks,
+ 0, // connection flags
+ &conn);
+ if (ret != SASL_OK)
+ throw String("authentication engine error");
+
+ ret = sasl_checkpass(conn,
+ "root", 4,
+ passwd.c_str(), passwd.size());
+ if (ret == SASL_OK)
+ success = true;
+ else
+ if (ret != SASL_BADAUTH)
+ throw String("authentication engine error");
+
+ sasl_dispose(&conn); conn = 0;
+ return success;
+ } catch ( ... ) {
+ if (conn) {
+ sasl_dispose(&conn);
+ conn = 0;
+ }
+ throw;
}
+}
+
+
+
+bool
+Auth::initialize_auth_system()
+{
+ MutexLocker l(mutex);
- if (pid == 0) {
- /* child */
- close_fd(0);
- close_fd(1);
- close_fd(2);
-
- close_fd(_stdin_pipe[1]);
- dup2(_stdin_pipe[0], 0);
- close_fd(_stdin_pipe[0]);
-
- // restore signals
- for (int x = 1; x < _NSIG; x++)
- signal(x, SIG_DFL);
- sigset_t set;
- sigfillset(&set);
- sigprocmask(SIG_UNBLOCK, &set, NULL);
-
- /* exec */
- execl(_path.c_str(), _path.c_str(), NULL);
- _exit(1);
+ if (!inited) {
+ int ret = sasl_server_init(callbacks, "ricci");
+ inited = (ret == SASL_OK);
}
-
-
- /* parent */
-
- close_fd(_stdin_pipe[0]);
-
+ return inited;
+}
+
+int
+sasl_getopts_callback(void* context,
+ const char* plugin_name,
+ const char* option,
+ const char** result,
+ unsigned * len)
+{
try {
- String pass = passwd + "\n";
- do {
- int size = write(_stdin_pipe[1], pass.c_str(), pass.size());
- if (size == -1) {
- if (errno == EINTR)
- continue;
- else {
- cout << errno << endl;
- throw String("write() error");
- }
+ static const char authd_option[] = "pwcheck_method";
+ static const char authd_result[] = "saslauthd";
+
+ static const char authd_version_option[] = "saslauthd_version";
+ static const char authd_version_result[] = "2";
+
+
+ if (result) {
+ *result = 0;
+ if (strcmp(option, authd_option) == 0)
+ *result = authd_result;
+ else if (strcmp(option, authd_version_option) == 0)
+ *result = authd_version_result;
+ else {
+ // modify more options we'd like to use
}
- pass = pass.substr(size, pass.npos);
- } while (!pass.empty());
+ }
+ if (len)
+ *len = 0;
+
+ return SASL_OK;
} catch ( ... ) {
- close_fd(_stdin_pipe[1]);
- throw;
- }
- close_fd(_stdin_pipe[1]);
-
- bool success = false;
- int ret, status;
- do {
- ret = waitpid(pid, &status, 0);
- } while ((ret < 0) && (errno == EINTR));
-
- if (WIFEXITED(status)) {
- status = WEXITSTATUS(status);
- success = (status == 0);
+ return SASL_FAIL;
}
- return success;
}
--- conga/ricci/ricci/Auth.h 2006/08/10 22:53:09 1.2
+++ conga/ricci/ricci/Auth.h 2006/10/24 21:54:29 1.3
@@ -27,6 +27,9 @@
#include "String.h"
+// thread safe
+
+
class Auth
{
public:
@@ -34,9 +37,10 @@
virtual ~Auth();
bool authenticate(const String& passwd) const;
- private:
- String _path;
+
+ static bool initialize_auth_system(); // to be called@start-up (not required)
+
};
--- conga/ricci/ricci/Makefile 2006/08/22 23:01:17 1.16
+++ conga/ricci/ricci/Makefile 2006/10/24 21:54:29 1.17
@@ -44,7 +44,8 @@
LDFLAGS += `pkg-config --libs dbus-1`
-all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER}
+#all: ${TARGET} ${TARGET_AUTH} ${TARGET_WORKER}
+all: ${TARGET} ${TARGET_WORKER}
*.o: *.h ../include/*.h
@@ -52,7 +53,7 @@
$(INSTALL_DIR) ${sbindir}
$(INSTALL_BIN) ${TARGET} ${sbindir}
$(INSTALL_DIR) ${libexecdir}/ricci
- install -m 4755 ${TARGET_AUTH} ${libexecdir}/ricci
+ #install -m 4755 ${TARGET_AUTH} ${libexecdir}/ricci
$(INSTALL_BIN) ${TARGET_WORKER} ${libexecdir}/ricci
$(INSTALL_DIR) ${localstatedir}/lib/ricci/queue
$(INSTALL_DIR) ${localstatedir}/lib/ricci/certs
@@ -77,10 +78,14 @@
$(TARGET): $(OBJECTS)
- $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS)
+ $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) -lsasl2
${TARGET_AUTH}: $(TARGET_AUTH_OBJECTS)
$(CXX) -o ${TARGET_AUTH} $(TARGET_AUTH_OBJECTS) ${LDFLAGS} -lpam
${TARGET_WORKER}: ${TARGET_WORKER_OBJECTS}
$(CXX) -o ${TARGET_WORKER} ${TARGET_WORKER_OBJECTS} ${LDFLAGS}
+
+
+Auth_test: Auth_test.o Auth.o
+ $(CXX) -o Auth_test Auth_test.o Auth.o ${LDFLAGS} -lsasl2
^ permalink raw reply [flat|nested] 7+ messages in thread* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2006-08-22 17:32 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-08-22 17:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-08-22 17:32:07
Modified files:
. : conga.spec.in.in
make : version.in
ricci : Changelog
Log message:
version bump
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.35&r2=1.36
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.15&r2=1.16
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Changelog.diff?cvsroot=cluster&r1=1.3&r2=1.4
--- conga/conga.spec.in.in 2006/08/21 23:22:14 1.35
+++ conga/conga.spec.in.in 2006/08/22 17:32:06 1.36
@@ -278,6 +278,9 @@
%changelog
+* Fri Aug 18 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-13
+- Version bump
+
* Fri Aug 18 2006 Stanko Kupcevic <kupcevic@redhat.com> 0.8-12
- Don't auto-start ricci after installation, do it manually
- Under certain circumstances, default luci password would not get reset
--- conga/make/version.in 2006/08/17 19:12:54 1.15
+++ conga/make/version.in 2006/08/22 17:32:06 1.16
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=12
+RELEASE=13
--- conga/ricci/Changelog 2006/07/17 22:45:36 1.3
+++ conga/ricci/Changelog 2006/08/22 17:32:06 1.4
@@ -1,4 +1,11 @@
+2006-08-18 Stanko Kupcevic <kupcevic@redhat.com>
+ * Don't auto-start ricci after installation, do it manually
+ * storage module: use `pvdisplay -c` if `pvs` fails
+ (`pvs` will fail if one of hard drives is not readable,
+ while `pvdisplay -c` will give incomplete but usefull info)
+ * shred strings
+
2006-07-17 Stanko Kupcevic <kupcevic@redhat.com>
* common/executils.cpp: clear stdout/stderr buffers before executing external commands
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2006-06-19 21:21 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-06-19 21:21 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-06-19 21:21:54
Modified files:
. : conga.spec.in.in
make : version.in
ricci/modules/cluster/clumon/src/daemon: Communicator.cpp
Communicator.h
ricci/modules/cluster/clumon/src/snmp-agent: clusterMIB.cpp
ricci/ricci : QueueLocker.cpp Ricci.cpp
Log message:
Clean compiler warnings on x86_64, ppc64, s390
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/QueueLocker.cpp.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Ricci.cpp.diff?cvsroot=cluster&r1=1.8&r2=1.9
--- conga/conga.spec.in.in 2006/06/16 23:14:33 1.7
+++ conga/conga.spec.in.in 2006/06/19 21:21:54 1.8
@@ -48,7 +48,7 @@
%setup -q
%build
-./autogen.sh
+#./autogen.sh
#./configure --arch=%{_arch} --sbindir=%{_sbindir} --libdir=%{_libdir} --docdir=%{_docdir}
%configure --arch=%{_arch} --docdir=%{_docdir} --pegasus_providers_dir=%{PEGASUS_PROVIDERS_DIR}
make
--- conga/make/version.in 2006/06/16 21:34:25 1.5
+++ conga/make/version.in 2006/06/19 21:21:54 1.6
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=4.FC5
+RELEASE=5.FC6
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp 2006/03/27 23:15:30 1.1
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.cpp 2006/06/19 21:21:54 1.2
@@ -41,6 +41,14 @@
+CommDP::CommDP()
+{}
+
+CommDP::~CommDP()
+{}
+
+
+
Communicator::Communicator(unsigned short port,
CommDP& delivery_point) :
_port(port),
--- conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h 2006/03/27 23:15:30 1.1
+++ conga/ricci/modules/cluster/clumon/src/daemon/Communicator.h 2006/06/19 21:21:54 1.2
@@ -41,6 +41,9 @@
class CommDP
{
public:
+ CommDP();
+ virtual ~CommDP();
+
virtual void msg_arrived(const std::string& host,
const std::string& msg) = 0;
};
--- conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp 2006/06/14 21:44:37 1.1
+++ conga/ricci/modules/cluster/clumon/src/snmp-agent/clusterMIB.cpp 2006/06/19 21:21:54 1.2
@@ -33,7 +33,7 @@
using namespace std;
-static unsigned int getStatusCode();
+static unsigned int getStatusCode(Cluster*);
static string getStatusDescription(unsigned int code);
--- conga/ricci/ricci/QueueLocker.cpp 2006/03/23 16:29:37 1.1
+++ conga/ricci/ricci/QueueLocker.cpp 2006/06/19 21:21:54 1.2
@@ -54,9 +54,9 @@
// acquire flock
int res;
- while (res = flock(fd, LOCK_EX))
+ while ((res = flock(fd, LOCK_EX)))
if (errno != EINTR) {
- while (res = close(fd))
+ while ((res = close(fd)))
if (errno != EINTR)
throw string("unable to close the queue lock file");
throw string("unable to lock the queue");
@@ -72,9 +72,9 @@
if (!--q_counter) {
// release flock
int res;
- while (res = close(fd))
+ while ((res = close(fd)))
if (errno != EINTR) {
- while (res = flock(fd, LOCK_UN))
+ while ((res = flock(fd, LOCK_UN)))
if (errno != EINTR)
break; // throw string("unable to unlock the queue");
break; // throw string("unable to close the queue lock file");
--- conga/ricci/ricci/Ricci.cpp 2006/06/09 16:32:19 1.8
+++ conga/ricci/ricci/Ricci.cpp 2006/06/19 21:21:54 1.9
@@ -295,7 +295,7 @@
S_IRUSR|S_IWUSR|S_IRGRP);
if (fd == -1)
throw string("unable to create batch file");
- while (res = close(fd))
+ while ((res = close(fd)))
if (errno != EINTR)
throw string("unable to close batch fd");
@@ -427,7 +427,7 @@
if (!dir)
throw string("unable to open queue directory");
struct dirent* file_entry;
- while (file_entry = readdir(dir))
+ while ((file_entry = readdir(dir)))
try {
string name(file_entry->d_name);
// check name
^ permalink raw reply [flat|nested] 7+ messages in thread* [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci ...
@ 2006-06-15 3:08 kupcevic
0 siblings, 0 replies; 7+ messages in thread
From: kupcevic @ 2006-06-15 3:08 UTC (permalink / raw)
To: cluster-devel.redhat.com
CVSROOT: /cvs/cluster
Module name: conga
Changes by: kupcevic at sourceware.org 2006-06-15 03:08:37
Modified files:
. : conga.spec.in.in
make : version.in
ricci : Makefile
ricci/init.d : ricci
ricci/modules/cluster: Makefile
ricci/modules/log: Makefile
ricci/modules/rpm: Makefile
ricci/modules/service: Makefile
ricci/modules/storage: Makefile
ricci/ricci : DBusController.cpp Makefile dbus_test.cpp
Added files:
ricci/modules/cluster/d-bus: ricci-modcluster.oddjob.conf
ricci-modcluster.systembus.conf
ricci/modules/log/d-bus: ricci-modlog.oddjob.conf
ricci-modlog.systembus.conf
ricci/modules/rpm/d-bus: ricci-modrpm.oddjob.conf
ricci-modrpm.systembus.conf
ricci/modules/service/d-bus: ricci-modservice.oddjob.conf
ricci-modservice.systembus.conf
ricci/modules/storage/d-bus: ricci-modstorage.oddjob.conf
ricci-modstorage.systembus.conf
ricci/ricci/d-bus: ricci.oddjob.conf ricci.systembus.conf
Removed files:
ricci/oddjobd.conf.d: Makefile modcluster_rw.conf modlog_rw.conf
modrpm_rw.conf modservice_rw.conf
modstorage_rw.conf reboot.conf
Log message:
Use com.redhat.ricci d-bus namespace instead of com.redhat.oddjob; conga.spec: proper paths and reload of messagebus and oddjob on installs/upgrades
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/conga.spec.in.in.diff?cvsroot=cluster&r1=1.4&r2=1.5
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/make/version.in.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/Makefile.diff?cvsroot=cluster&r1=1.7&r2=1.8
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/init.d/ricci.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/Makefile.diff?cvsroot=cluster&r1=1.8&r2=1.9
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/Makefile.diff?cvsroot=cluster&r1=1.1&r2=1.2
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/Makefile.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/Makefile.diff?cvsroot=cluster&r1=1.3&r2=1.4
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/Makefile.diff?cvsroot=cluster&r1=1.5&r2=1.6
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/Makefile.diff?cvsroot=cluster&r1=1.5&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modcluster_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modlog_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modrpm_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modservice_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/modstorage_rw.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/oddjobd.conf.d/reboot.conf.diff?cvsroot=cluster&r1=1.1&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/DBusController.cpp.diff?cvsroot=cluster&r1=1.10&r2=1.11
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/Makefile.diff?cvsroot=cluster&r1=1.9&r2=1.10
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/dbus_test.cpp.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.oddjob.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/ricci/ricci/d-bus/ricci.systembus.conf.diff?cvsroot=cluster&r1=NONE&r2=1.1
--- conga/conga.spec.in.in 2006/06/14 21:44:34 1.4
+++ conga/conga.spec.in.in 2006/06/15 03:08:35 1.5
@@ -86,22 +86,20 @@
%files -n luci
%defattr(-,root,root)
-%config /etc/rc.d/init.d/luci
-%{_sbindir}/luci_admin
-%attr(-,luci,root) /var/lib/luci
-%attr(600,luci,root) /var/lib/luci/var/Data.fs
-%config /var/lib/luci/var/Data.fs
-%config /var/lib/luci/etc/zope.conf
-%config(noreplace) /var/lib/luci/etc/logrotate.conf
-%config(noreplace) /var/lib/luci/etc/stunnel.conf
-
+%config %{_sysconfdir}/rc.d/init.d/luci
+ %{_sbindir}/luci_admin
+%attr(-,luci,root) %{_localstatedir}/lib/luci
+%attr(600,luci,root) %{_localstatedir}/lib/luci/var/Data.fs
+%config %{_localstatedir}/lib/luci/var/Data.fs
+%config %{_localstatedir}/lib/luci/etc/zope.conf
+%config(noreplace) %{_localstatedir}/lib/luci/etc/logrotate.conf
+%config(noreplace) %{_localstatedir}/lib/luci/etc/stunnel.conf
%pre -n luci
/usr/sbin/groupadd -r -f luci >/dev/null 2>&1
/usr/sbin/useradd -r -M -s /sbin/nologin -g luci luci >/dev/null 2>&1
exit 0
-
%post -n luci
/sbin/chkconfig --add luci
if [ ! -e /var/lib/luci/var/certs/privkey.pem ]; then
@@ -117,14 +115,12 @@
/bin/chown luci /var/lib/luci/inituser
fi
-
%preun -n luci
if [ "$1" = 0 ]; then
/sbin/service luci stop >/dev/null 2>$1
/sbin/chkconfig --del luci
fi
-
%postun -n luci
if [ "$1" -ge "1" ]; then
/sbin/service luci condrestart > /dev/null 2>&1
@@ -163,26 +159,26 @@
# ricci
#%doc README COPYING
-%config /etc/rc.d/init.d/ricci
-%config /etc/oddjobd.conf.d/reboot.conf
-%config(noreplace) /etc/pam.d/ricci
-%attr(-,ricci,root) /var/lib/ricci
-%{_sbindir}/ricci
-%{_sbindir}/ricci-worker
-%attr(4755,root,root) %{_sbindir}/ricci-auth
+%config %{_sysconfdir}/rc.d/init.d/ricci
+%config(noreplace) %{_sysconfdir}/pam.d/ricci
+ %{_sysconfdir}/oddjobd.conf.d/ricci.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci.systembus.conf
+%attr(-,ricci,root) %{_localstatedir}/lib/ricci
+ %{_sbindir}/ricci
+ %{_sbindir}/ricci-worker
+%attr(4755,root,root) %{_sbindir}/ricci-auth
# modrpm
-%config /etc/oddjobd.conf.d/modrpm_rw.conf
-%{_sbindir}/ricci-modrpm
-%{_sbindir}/ricci-modrpm.exe
-
+ %{_sysconfdir}/oddjobd.conf.d/ricci-modrpm.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci-modrpm.systembus.conf
+ %{_sbindir}/ricci-modrpm
+ %{_sbindir}/ricci-modrpm.exe
%pre -n ricci
/usr/sbin/groupadd -r -f ricci >/dev/null 2>&1
/usr/sbin/useradd -r -M -s /sbin/nologin -g ricci ricci >/dev/null 2>&1
exit 0
-
%post -n ricci
/sbin/chkconfig --add ricci
if [ ! -e /var/lib/ricci/certs/privkey.pem ]; then
@@ -193,14 +189,14 @@
/bin/chmod 644 /var/lib/ricci/certs/cacert.pem
/bin/chmod 600 /var/lib/ricci/certs/privkey.pem
fi
-/sbin/chkconfig messagebus on
-/sbin/chkconfig oddjobd on
-/sbin/service messagebus start > /dev/null 2>&1
/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
-/sbin/service oddjobd start > /dev/null 2>&1
/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service ricci restart > /dev/null 2>&1
-
+RUNS=(`runlevel`)
+RUNLEVEL=${RUNS[1]}
+STATE=`chkconfig --list ricci | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+if [ $STATE = "on" ]; then
+ /sbin/service ricci restart > /dev/null 2>&1
+fi
%preun -n ricci
if [ "$1" = 0 ]; then
@@ -208,12 +204,12 @@
/sbin/chkconfig --del ricci
fi
-
%postun -n ricci
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+/sbin/service oddjobd reload > /dev/null 2>&1
if [ "$1" -ge "1" ]; then
/sbin/service ricci condrestart > /dev/null 2>&1
fi
-/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
@@ -234,22 +230,26 @@
%description -n ricci-modcluster
ricci-modcluster description
-
%files -n ricci-modcluster
%defattr(-,root,root)
#%doc README
-%config /etc/rc.d/init.d/ricci-modclusterd
-%config /etc/oddjobd.conf.d/modcluster_rw.conf
-%{_sbindir}/ricci-modcluster
-%{_sbindir}/ricci-modcluster.exe
-%{_sbindir}/ricci-modclusterd
-
+%config %{_sysconfdir}/rc.d/init.d/ricci-modclusterd
+ %{_sysconfdir}/oddjobd.conf.d/ricci-modcluster.oddjob.conf
+ %{_sysconfdir}/dbus-1/system.d/ricci-modcluster.systembus.conf
+ %{_sbindir}/ricci-modcluster
+ %{_sbindir}/ricci-modcluster.exe
+ %{_sbindir}/ricci-modclusterd
%post -n ricci-modcluster
/sbin/chkconfig --add ricci-modclusterd
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
-/sbin/service ricci-modclusterd restart > /dev/null 2>&1
-
+RUNS=(`runlevel`)
+RUNLEVEL=${RUNS[1]}
+STATE=`chkconfig --list ricci-modclusterd | sed -e s,.*\\\t$RUNLEVEL:\\\\\(o[nf]f\\\?\\\\\).*,\\\1,`
+if [ $STATE = "on" ]; then
+ /sbin/service ricci-modclusterd restart > /dev/null 2>&1
+fi
%preun -n ricci-modcluster
if [ "$1" = 0 ]; then
@@ -257,12 +257,12 @@
/sbin/chkconfig --del ricci-modclusterd
fi
-
%postun -n ricci-modcluster
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
+/sbin/service oddjobd reload > /dev/null 2>&1
if [ "$1" -ge "1" ]; then
/sbin/service ricci-modclusterd condrestart > /dev/null 2>&1
fi
-/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
@@ -282,21 +282,23 @@
%description -n ricci-modstorage
ricci-modstorage description
-
%files -n ricci-modstorage
%defattr(-,root,root)
#%doc README
-%config /etc/oddjobd.conf.d/modstorage_rw.conf
+%{_sysconfdir}/oddjobd.conf.d/ricci-modstorage.oddjob.conf
+%{_sysconfdir}/dbus-1/system.d/ricci-modstorage.systembus.conf
%{_sbindir}/ricci-modstorage
%{_sbindir}/ricci-modstorage.exe
%post -n ricci-modstorage
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
%preun -n ricci-modstorage
%postun -n ricci-modstorage
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
@@ -317,21 +319,23 @@
%description -n ricci-modservice
ricci-modservice description
-
%files -n ricci-modservice
%defattr(-,root,root)
#%doc README
-%config /etc/oddjobd.conf.d/modservice_rw.conf
+%{_sysconfdir}/oddjobd.conf.d/ricci-modservice.oddjob.conf
+%{_sysconfdir}/dbus-1/system.d/ricci-modservice.systembus.conf
%{_sbindir}/ricci-modservice
%{_sbindir}/ricci-modservice.exe
%post -n ricci-modservice
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
%preun -n ricci-modservice
%postun -n ricci-modservice
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
@@ -352,22 +356,23 @@
%description -n ricci-modlog
ricci-modlog description
-
%files -n ricci-modlog
%defattr(-,root,root)
#%doc README
-%config /etc/oddjobd.conf.d/modlog_rw.conf
+%{_sysconfdir}/oddjobd.conf.d/ricci-modlog.oddjob.conf
+%{_sysconfdir}/dbus-1/system.d/ricci-modlog.systembus.conf
%{_sbindir}/ricci-modlog
%{_sbindir}/ricci-modlog.exe
%post -n ricci-modlog
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
-
%preun -n ricci-modlog
%postun -n ricci-modlog
+/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
/sbin/service oddjobd reload > /dev/null 2>&1
exit 0
@@ -390,17 +395,17 @@
%description -n cluster-snmp
SNMP agent for Red Hat Enterprise Linux Cluster Suite
-
%files -n cluster-snmp
%defattr(-,root,root)
-%{_libdir}/cluster-snmp/
-%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-MIB
-%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
-%{_docdir}/cluster-snmp-%{version}/
+ %{_libdir}/cluster-snmp/
+%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-MIB
+%attr(644,root,root) %{_datadir}/snmp/mibs/REDHAT-CLUSTER-MIB
+ %{_docdir}/cluster-snmp-%{version}/
%pre -n cluster-snmp
%post -n cluster-snmp
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
#/sbin/service oddjobd reload > /dev/null 2>&1
/sbin/service snmpd condrestart > /dev/null 2>&1
exit 0
@@ -408,6 +413,7 @@
%preun -n cluster-snmp
%postun -n cluster-snmp
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
#/sbin/service oddjobd reload > /dev/null 2>&1
/sbin/service snmpd condrestart > /dev/null 2>&1
exit 0
@@ -431,7 +437,6 @@
%description -n cluster-cim
CIM provider for Red Hat Enterprise Linux Cluster Suite
-
%files -n cluster-cim
%defattr(-,root,root)
%{PEGASUS_PROVIDERS_DIR}/libRedHatClusterProvider.so
@@ -440,6 +445,7 @@
%pre -n cluster-cim
%post -n cluster-cim
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
#/sbin/service oddjobd reload > /dev/null 2>&1
/sbin/service tog-pegasus condrestart > /dev/null 2>&1
exit 0
@@ -447,6 +453,7 @@
%preun -n cluster-cim
%postun -n cluster-cim
+#/bin/kill -s SIGHUP `cat /var/run/messagebus.pid`
#/sbin/service oddjobd reload > /dev/null 2>&1
/sbin/service tog-pegasus condrestart > /dev/null 2>&1
exit 0
--- conga/make/version.in 2006/06/14 21:44:34 1.3
+++ conga/make/version.in 2006/06/15 03:08:35 1.4
@@ -1,2 +1,2 @@
VERSION=0.8
-RELEASE=1.FC5
+RELEASE=3.FC5
--- conga/ricci/Makefile 2006/06/14 21:44:34 1.7
+++ conga/ricci/Makefile 2006/06/15 03:08:35 1.8
@@ -20,7 +20,6 @@
make -C modules
make -C init.d
make -C pam.d
- make -C oddjobd.conf.d
install:
@@ -28,7 +27,7 @@
make -C modules install
make -C init.d install
make -C pam.d install
- make -C oddjobd.conf.d install
+
uninstall:
@@ -38,7 +37,7 @@
make -C modules clean
make -C init.d clean
make -C pam.d clean
- make -C oddjobd.conf.d clean
+
distclean: clean
rm -f make/defines.mk
--- conga/ricci/init.d/ricci 2006/04/07 16:42:39 1.5
+++ conga/ricci/init.d/ricci 2006/06/15 03:08:36 1.6
@@ -38,9 +38,23 @@
case $1 in
start)
+ service messagebus status > /dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ service messagebus start
+ service messagebus status > /dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo "not starting ricci..."
+ exit 1
+ fi
+ fi
service oddjobd status > /dev/null 2>&1
if [ $? -ne 0 ]; then
- /sbin/service oddjobd start
+ service oddjobd start
+ service oddjobd status > /dev/null 2>&1
+ if [ $? -ne 0 ]; then
+ echo "not starting ricci..."
+ exit 1
+ fi
fi
NewUID=`cat /etc/passwd | grep "^$RUNASUSER:" | sed -e 's/^[^:]*:[^:]*://' -e 's/:.*//'`
--- conga/ricci/modules/cluster/Makefile 2006/04/07 16:42:40 1.8
+++ conga/ricci/modules/cluster/Makefile 2006/06/15 03:08:36 1.9
@@ -38,6 +38,10 @@
install -d ${sbindir}
install ${TARGET} ${sbindir}
install ricci-modcluster ${sbindir}
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci-modcluster.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci-modcluster.systembus.conf ${sysconfdir}/dbus-1/system.d
make -C clumon install
uninstall:
/cvs/cluster/conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/cluster/d-bus/ricci-modcluster.oddjob.conf
+++ - 2006-06-15 03:08:38.412154000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modcluster_rw">
+ <helper exec="/usr/sbin/ricci-modcluster"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ <method name="modcluster_ro">
+ <helper exec="/usr/sbin/ricci-modcluster_ro"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/cluster/d-bus/ricci-modcluster.systembus.conf
+++ - 2006-06-15 03:08:38.507288000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call modcluster_rw and modcluster_ro
+ methods. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modcluster_rw"/>
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modcluster_ro"/>
+ </policy>
+
+</busconfig>
--- conga/ricci/modules/log/Makefile 2006/06/02 00:14:29 1.1
+++ conga/ricci/modules/log/Makefile 2006/06/15 03:08:36 1.2
@@ -34,6 +34,11 @@
install -d ${sbindir}
install ${TARGET} ${sbindir}
install ricci-modlog ${sbindir}
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci-modlog.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci-modlog.systembus.conf ${sysconfdir}/dbus-1/system.d
+
uninstall:
/cvs/cluster/conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/log/d-bus/ricci-modlog.oddjob.conf
+++ - 2006-06-15 03:08:38.763576000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modlog_rw">
+ <helper exec="/usr/sbin/ricci-modlog"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ <method name="modlog_ro">
+ <helper exec="/usr/sbin/ricci-modlog_ro"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/log/d-bus/ricci-modlog.systembus.conf
+++ - 2006-06-15 03:08:39.065797000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call modlog_rw and modlog_ro
+ methods. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modlog_rw"/>
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modlog_ro"/>
+ </policy>
+
+</busconfig>
--- conga/ricci/modules/rpm/Makefile 2006/04/07 16:42:40 1.2
+++ conga/ricci/modules/rpm/Makefile 2006/06/15 03:08:36 1.3
@@ -34,6 +34,11 @@
install -d ${sbindir}
install ${TARGET} ${sbindir}
install ricci-modrpm ${sbindir}
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci-modrpm.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci-modrpm.systembus.conf ${sysconfdir}/dbus-1/system.d
+
uninstall:
/cvs/cluster/conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/rpm/d-bus/ricci-modrpm.oddjob.conf
+++ - 2006-06-15 03:08:39.284783000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modrpm_rw">
+ <helper exec="/usr/sbin/ricci-modrpm"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ <method name="modrpm_ro">
+ <helper exec="/usr/sbin/ricci-modrpm_ro"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/rpm/d-bus/ricci-modrpm.systembus.conf
+++ - 2006-06-15 03:08:39.402671000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call modrpm_rw and modrpm_ro
+ methods. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modrpm_rw"/>
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modrpm_ro"/>
+ </policy>
+
+</busconfig>
--- conga/ricci/modules/service/Makefile 2006/04/07 16:42:40 1.3
+++ conga/ricci/modules/service/Makefile 2006/06/15 03:08:36 1.4
@@ -34,6 +34,11 @@
install -d ${sbindir}
install ${TARGET} ${sbindir}
install ricci-modservice ${sbindir}
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci-modservice.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci-modservice.systembus.conf ${sysconfdir}/dbus-1/system.d
+
uninstall:
/cvs/cluster/conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/service/d-bus/ricci-modservice.oddjob.conf
+++ - 2006-06-15 03:08:39.615317000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modservice_rw">
+ <helper exec="/usr/sbin/ricci-modservice"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ <method name="modservice_ro">
+ <helper exec="/usr/sbin/ricci-modservice_ro"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/service/d-bus/ricci-modservice.systembus.conf
+++ - 2006-06-15 03:08:39.747052000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call modservice_rw and modservice_ro
+ methods. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modservice_rw"/>
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modservice_ro"/>
+ </policy>
+
+</busconfig>
--- conga/ricci/modules/storage/Makefile 2006/04/07 16:42:40 1.5
+++ conga/ricci/modules/storage/Makefile 2006/06/15 03:08:37 1.6
@@ -63,6 +63,11 @@
install -d ${sbindir}
install ${TARGET} ${sbindir}
install ricci-modstorage ${sbindir}
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci-modstorage.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci-modstorage.systembus.conf ${sysconfdir}/dbus-1/system.d
+
uninstall:
/cvs/cluster/conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/storage/d-bus/ricci-modstorage.oddjob.conf
+++ - 2006-06-15 03:08:39.969505000 +0000
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modstorage_rw">
+ <helper exec="/usr/sbin/ricci-modstorage"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ <method name="modstorage_ro">
+ <helper exec="/usr/sbin/ricci-modstorage_ro"
+ arguments="1"
+ prepend_user_name="no"
+ argument_passing_method="stdin"
+ />
+ <allow user="root"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/modules/storage/d-bus/ricci-modstorage.systembus.conf
+++ - 2006-06-15 03:08:40.054604000 +0000
@@ -0,0 +1,25 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call modstorage_rw and modstorage_ro
+ methods. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modstorage_rw"/>
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="modstorage_ro"/>
+ </policy>
+
+</busconfig>
--- conga/ricci/ricci/DBusController.cpp 2006/06/02 00:14:29 1.10
+++ conga/ricci/ricci/DBusController.cpp 2006/06/15 03:08:37 1.11
@@ -134,9 +134,9 @@
throw string("module not supported");
// prepare msg
- DBusMessage* msg = dbus_message_new_method_call("com.redhat.oddjob",
- "/com/redhat/oddjob",
- "com.redhat.oddjob",
+ DBusMessage* msg = dbus_message_new_method_call("com.redhat.ricci",
+ "/com/redhat/ricci",
+ "com.redhat.ricci",
_mod_map[module_name].c_str());
if (!msg)
throw string("not enough memory to create message");
--- conga/ricci/ricci/Makefile 2006/06/14 21:44:37 1.9
+++ conga/ricci/ricci/Makefile 2006/06/15 03:08:37 1.10
@@ -58,10 +58,15 @@
install -d ${localstatedir}/lib/ricci/certs
install -d ${localstatedir}/lib/ricci/certs/clients
install -d ${localstatedir}/lib/ricci/queue
+ install cacert.config ${localstatedir}/lib/ricci/certs/
install ${TARGET} ${sbindir}
install ${TARGET_AUTH} ${sbindir}
install ${TARGET_WORKER} ${sbindir}
- install cacert.config ${localstatedir}/lib/ricci/certs/
+ install -d ${sysconfdir}/oddjobd.conf.d
+ install -d ${sysconfdir}/dbus-1/system.d
+ install d-bus/ricci.oddjob.conf ${sysconfdir}/oddjobd.conf.d
+ install d-bus/ricci.systembus.conf ${sysconfdir}/dbus-1/system.d
+
uninstall:
--- conga/ricci/ricci/dbus_test.cpp 2006/03/10 17:50:11 1.2
+++ conga/ricci/ricci/dbus_test.cpp 2006/06/15 03:08:37 1.3
@@ -13,10 +13,10 @@
DBusConnection* conn = dbus_bus_get(DBUS_BUS_SYSTEM,
NULL);
- DBusMessage* msg = dbus_message_new_method_call("com.redhat.oddjob",
- "/com/redhat/oddjob",
- "com.redhat.oddjob",
- "cluster_rw");
+ 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;
/cvs/cluster/conga/ricci/ricci/d-bus/ricci.oddjob.conf,v --> standard output
revision 1.1
--- conga/ricci/ricci/d-bus/ricci.oddjob.conf
+++ - 2006-06-15 03:08:41.768391000 +0000
@@ -0,0 +1,33 @@
+<?xml version="1.0"?>
+<oddjobconfig>
+ <service name="com.redhat.ricci">
+ <object name="/com/redhat/ricci">
+ <interface name="com.redhat.ricci">
+ <method name="modrpm_rw">
+ <allow user="ricci"/>
+ </method>
+ <method name="modlog_rw">
+ <allow user="ricci"/>
+ </method>
+ <method name="modcluster_rw">
+ <allow user="ricci"/>
+ </method>
+ <method name="modstorage_rw">
+ <allow user="ricci"/>
+ </method>
+ <method name="modservice_rw">
+ <allow user="ricci"/>
+ </method>
+ <method name="reboot">
+ <helper exec="/sbin/reboot"
+ arguments="0"
+ prepend_user_name="no"
+ argument_passing_method="cmdline"
+ />
+ <allow user="root"/>
+ <allow user="ricci"/>
+ </method>
+ </interface>
+ </object>
+ </service>
+</oddjobconfig>
/cvs/cluster/conga/ricci/ricci/d-bus/ricci.systembus.conf,v --> standard output
revision 1.1
--- conga/ricci/ricci/d-bus/ricci.systembus.conf
+++ - 2006-06-15 03:08:41.877664000 +0000
@@ -0,0 +1,21 @@
+<!DOCTYPE busconfig PUBLIC
+ "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+
+<busconfig>
+
+ <!-- Only root can own ricci service. -->
+ <policy user="root">
+ <allow own="com.redhat.ricci"/>
+ </policy>
+
+ <!-- Allow anyone to call the reboot
+ method. oddjobd performs actual ACL. -->
+ <policy context="default">
+ <allow send_destination="com.redhat.ricci"
+ send_path="/com/redhat/ricci"
+ send_interface="com.redhat.ricci"
+ send_member="reboot"/>
+ </policy>
+
+</busconfig>
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2008-09-23 17:42 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2006-10-24 21:59 [Cluster-devel] conga ./conga.spec.in.in make/version.in ricci kupcevic
-- strict thread matches above, loose matches on Subject: below --
2008-09-23 17:42 rmccabe
2008-08-27 14:59 rmccabe
2006-10-24 21:54 kupcevic
2006-08-22 17:32 kupcevic
2006-06-19 21:21 kupcevic
2006-06-15 3:08 kupcevic
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).