From 82f559931f79911ceb130d98e04b18e7d4a946d4 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 5 Dec 2003 01:43:24 +0000
Subject: [PATCH] remove left over debug print statement.
git-svn-id: http://root.cern.ch/svn/root/trunk@7695 27541ba8-7e3a-0410-8455-c3a389f83636
---
rootd/src/rootd.cxx | 48 ++++++++++++++++++++++-----------------------
1 file changed, 24 insertions(+), 24 deletions(-)
diff --git a/rootd/src/rootd.cxx b/rootd/src/rootd.cxx
index 56869269372..64c9292b052 100644
--- a/rootd/src/rootd.cxx
+++ b/rootd/src/rootd.cxx
@@ -1,4 +1,4 @@
-// @(#)root/rootd:$Name: $:$Id: rootd.cxx,v 1.70 2003/11/10 14:05:01 rdm Exp $
+// @(#)root/rootd:$Name: $:$Id: rootd.cxx,v 1.71 2003/11/20 23:00:46 rdm Exp $
// Author: Fons Rademakers 11/08/97
/*************************************************************************
@@ -962,34 +962,37 @@ void RootdLogin()
// Authentication was successful, set user environment.
struct passwd *pw = getpwnam(gUser);
- if (gDebug > 2) ErrorInfo("RootdLogin: login dir: %s (uid: %d)",pw->pw_dir, getuid());
+ if (gDebug > 2)
+ ErrorInfo("RootdLogin: login dir: %s (uid: %d)", pw->pw_dir, getuid());
if (chdir(pw->pw_dir) == -1) {
ErrorInfo("RootdLogin: can't change directory to %s",pw->pw_dir);
return;
}
- if (gDebug > 2) ErrorInfo("RootdLogin: gid: %d, uid: %d",pw->pw_gid,pw->pw_uid);
+ if (gDebug > 2)
+ ErrorInfo("RootdLogin: gid: %d, uid: %d", pw->pw_gid, pw->pw_uid);
+
if (getuid() == 0) {
- if (gAnon && chroot(pw->pw_dir) == -1) {
+ if (gAnon && chroot(pw->pw_dir) == -1) {
ErrorInfo("RootdLogin: can't chroot to %s", pw->pw_dir);
return;
- }
-
- // set access control list from /etc/initgroup
- initgroups(gUser, pw->pw_gid);
-
- // set gid
- if (setresgid(pw->pw_gid, pw->pw_gid, 0) == -1) {
- ErrorInfo("RootdLogin: can't setgid for user %s", gUser);
- return;
- }
- // set uid
- if (setresuid(pw->pw_uid, pw->pw_uid, 0) == -1) {
- ErrorInfo("RootdLogin: can't setuid for user %s", gUser);
- return;
- }
+ }
+
+ // set access control list from /etc/initgroup
+ initgroups(gUser, pw->pw_gid);
+
+ // set gid
+ if (setresgid(pw->pw_gid, pw->pw_gid, 0) == -1) {
+ ErrorInfo("RootdLogin: can't setgid for user %s", gUser);
+ return;
+ }
+ // set uid
+ if (setresuid(pw->pw_uid, pw->pw_uid, 0) == -1) {
+ ErrorInfo("RootdLogin: can't setuid for user %s", gUser);
+ return;
+ }
}
umask(022);
@@ -1343,10 +1346,6 @@ void RootdGet(const char *msg)
NetSendRaw(buf, len);
- if (gDebug > 0)
- ErrorInfo("RootdGet deb: read %d bytes from file \n ----> buf: %s",
- len, buf);
-
delete [] buf;
gBytesRead += len;
@@ -2380,7 +2379,8 @@ int main(int argc, char **argv)
strcpy(gConfDir, getenv("ROOTSYS"));
sprintf(gExecDir, "%s/bin", gConfDir);
sprintf(gSystemDaemonRc, "%s/etc/system%s", gConfDir, kDaemonRc);
- if (gDebug > 0) ErrorInfo("main: no config directory specified using ROOTSYS (%s)", gConfDir);
+ if (gDebug > 0)
+ ErrorInfo("main: no config directory specified using ROOTSYS (%s)", gConfDir);
} else {
if (!gInetdFlag)
fprintf(stderr, "rootd: no config directory specified\n");
--
GitLab