X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=cf2ef463e8ce20404746ae7dda5a28e44f538b84;hb=d31efcff675bdd407f300de4ad971b74abb0c38f;hp=68edeb9ee06c46fbf0500020bc64bc658645c1b0;hpb=10a8a2237343699e3923d87e24dbf2d7fe225377;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 68edeb9ee..cf2ef463e 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -1,19 +1,18 @@
 /*
  * Copyright (C)  2011 - David Goulet <david.goulet@polymtl.ca>
  *
- * 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; only version 2
- * of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * 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
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -25,10 +24,8 @@
 #include <sys/types.h>
 #include <urcu.h>
 
+#include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
-#include <common/runas.h>
-#include <common/lttngerr.h>
-#include <common/lttng-share.h>
 
 #include "session.h"
 
@@ -179,7 +176,7 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	/* Allocate session data structure */
 	new_session = zmalloc(sizeof(struct ltt_session));
 	if (new_session == NULL) {
-		perror("zmalloc");
+		PERROR("zmalloc");
 		ret = LTTCOMM_FATAL;
 		goto error_malloc;
 	}
@@ -223,7 +220,7 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	if (ret < 0) {
 		if (ret != -EEXIST) {
 			ERR("Trace directory creation error");
-			ret = LTTCOMM_CREATE_FAIL;
+			ret = LTTCOMM_CREATE_DIR_FAIL;
 			goto error;
 		}
 	}