From: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Date: Thu, 30 Jun 2022 08:23:38 +0000 (+0530)
Subject: pam/pam_cgroup.c: increase the column width to 100
X-Git-Tag: v3.0~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed37969ca863784068ca9f0c056b60e02c3fb927;p=thirdparty%2Flibcgroup.git

pam/pam_cgroup.c: increase the column width to 100

100 column width is more comfortable to read over 80 columns, lets
increase it.  This patch, also introduced/removes empty lines across
the file, making it more readable.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
Signed-off-by: Tom Hromatka <tom.hromatka@oracle.com>
---

diff --git a/src/pam/pam_cgroup.c b/src/pam/pam_cgroup.c
index 38c207c5..b268effe 100644
--- a/src/pam/pam_cgroup.c
+++ b/src/pam/pam_cgroup.c
@@ -57,7 +57,6 @@
 /*
  * Module defines
  */
-
 #define PAM_SM_SESSION
 
 #include <security/pam_modules.h>
@@ -66,7 +65,6 @@
 #include <security/pam_ext.h>
 
 /* argument parsing */
-
 #define PAM_DEBUG_ARG       0x0001
 
 static int _pam_parse(const pam_handle_t *pamh, int argc, const char **argv)
@@ -85,8 +83,7 @@ static int _pam_parse(const pam_handle_t *pamh, int argc, const char **argv)
 }
 
 /* now the session stuff */
-PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags,
-				   int argc, const char **argv)
+PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
 {
 	struct passwd *pwd;
 	char *user_name;
@@ -99,16 +96,14 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags,
 
 	ret = pam_get_item(pamh, PAM_USER, (void *) &user_name);
 	if (user_name == NULL || ret != PAM_SUCCESS)  {
-		pam_syslog(pamh, LOG_ERR,
-			   "open_session - error recovering username");
+		pam_syslog(pamh, LOG_ERR, "open_session - error recovering username");
 		return PAM_SESSION_ERR;
 	}
 
 	pwd = pam_modutil_getpwnam(pamh, user_name);
 	if (!pwd) {
 		if (ctrl & PAM_DEBUG_ARG)
-			pam_syslog(pamh, LOG_ERR,
-				   "open_session username '%s' does not exist",
+			pam_syslog(pamh, LOG_ERR, "open_session username '%s' does not exist",
 				   user_name);
 		return PAM_SESSION_ERR;
 	}
@@ -119,8 +114,7 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags,
 	ret = cgroup_init();
 	if (ret) {
 		if (ctrl & PAM_DEBUG_ARG)
-			pam_syslog(pamh, LOG_ERR,
-				   "libcgroup initialization failed");
+			pam_syslog(pamh, LOG_ERR, "libcgroup initialization failed");
 		return PAM_SESSION_ERR;
 	}
 
@@ -130,31 +124,27 @@ PAM_EXTERN int pam_sm_open_session(pam_handle_t *pamh, int flags,
 	pid = getpid();
 
 	/*
-	 * Note: We are using default gid here. Is there a way to determine
-	 * under what egid service will be provided?
+	 * Note: We are using default gid here. Is there a way to
+	 * determine under what egid service will be provided?
 	 */
-	ret = cgroup_change_cgroup_uid_gid_flags(pwd->pw_uid,
-		pwd->pw_gid, pid, CGFLAG_USECACHE);
+	ret = cgroup_change_cgroup_uid_gid_flags(pwd->pw_uid, pwd->pw_gid, pid, CGFLAG_USECACHE);
 	if (ret) {
 		if (ctrl & PAM_DEBUG_ARG) {
-			pam_syslog(pamh, LOG_ERR,
-				   "Change of cgroup for process with username");
+			pam_syslog(pamh, LOG_ERR, "Change of cgroup for process with username");
 			pam_syslog(pamh, LOG_ERR, "%s failed.\n", user_name);
 		}
 		return PAM_SESSION_ERR;
 	}
 
 	if (ctrl & PAM_DEBUG_ARG) {
-		pam_syslog(pamh, LOG_DEBUG,
-			   "Changed cgroup for process %d", pid);
-		pam_syslog(pamh, LOG_DEBUG, "  with username %s.\n", user_name);
+		pam_syslog(pamh, LOG_DEBUG, "Changed cgroup for process %d with username %s.\n",
+			   pid, user_name);
 	}
 
 	return PAM_SUCCESS;
 }
 
-PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc,
-				    const char **argv)
+PAM_EXTERN int pam_sm_close_session(pam_handle_t *pamh, int flags, int argc, const char **argv)
 {
 	D(("called pam_cgroup close session"));