chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Prep v229: Add missing fixes from upstream [1/6] src/basic
[elogind.git]
/
src
/
basic
/
user-util.h
diff --git
a/src/basic/user-util.h
b/src/basic/user-util.h
index 235d0769aa1db2d2b390555be43f8e78ba1d530a..8e652584d206e27e5c1a03d4b6455128bdc3899b 100644
(file)
--- a/
src/basic/user-util.h
+++ b/
src/basic/user-util.h
@@
-1,5
+1,3
@@
-/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
-
#pragma once
/***
#pragma once
/***
@@
-21,8
+19,8
@@
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
-#include <sys/types.h>
#include <stdbool.h>
#include <stdbool.h>
+#include <sys/types.h>
bool uid_is_valid(uid_t uid);
bool uid_is_valid(uid_t uid);
@@
-36,8
+34,7
@@
static inline int parse_gid(const char *s, gid_t *ret_gid) {
return parse_uid(s, (uid_t*) ret_gid);
}
return parse_uid(s, (uid_t*) ret_gid);
}
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
char* getlogname_malloc(void);
char* getusername_malloc(void);
#endif // 0
char* getlogname_malloc(void);
char* getusername_malloc(void);
#endif // 0
@@
-48,8
+45,7
@@
int get_group_creds(const char **groupname, gid_t *gid);
char* uid_to_name(uid_t uid);
char* gid_to_name(gid_t gid);
char* uid_to_name(uid_t uid);
char* gid_to_name(gid_t gid);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int in_gid(gid_t gid);
int in_group(const char *name);
int in_gid(gid_t gid);
int in_group(const char *name);
@@
-59,8
+55,7
@@
int get_shell(char **_ret);
int reset_uid_gid(void);
int reset_uid_gid(void);
-/// UNNEEDED by elogind
-#if 0
+#if 0 /// UNNEEDED by elogind
int take_etc_passwd_lock(const char *root);
#endif // 0
int take_etc_passwd_lock(const char *root);
#endif // 0