chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
basic/mount-util: recognize ocfs2 as network fs (#3713)
[elogind.git]
/
src
/
basic
/
user-util.c
diff --git
a/src/basic/user-util.c
b/src/basic/user-util.c
index 006a73e59ad24ab75311a91fa97217d45c895633..fbe9f2a969987f86b225bd3a170173c0698aa7d5 100644
(file)
--- a/
src/basic/user-util.c
+++ b/
src/basic/user-util.c
@@
-30,6
+30,7
@@
#include <sys/stat.h>
#include <unistd.h>
#include <sys/stat.h>
#include <unistd.h>
+#include "missing.h"
#include "alloc-util.h"
#include "fd-util.h"
#include "formats-util.h"
#include "alloc-util.h"
#include "fd-util.h"
#include "formats-util.h"
@@
-75,7
+76,6
@@
int parse_uid(const char *s, uid_t *ret) {
return 0;
}
return 0;
}
-#if 0 /// UNNEEDED by elogind
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
char* getlogname_malloc(void) {
uid_t uid;
struct stat st;
@@
-88,6
+88,7
@@
char* getlogname_malloc(void) {
return uid_to_name(uid);
}
return uid_to_name(uid);
}
+#if 0 /// UNNEEDED by elogind
char *getusername_malloc(void) {
const char *e;
char *getusername_malloc(void) {
const char *e;
@@
-462,7
+463,7
@@
int take_etc_passwd_lock(const char *root) {
*
* Note that shadow-utils also takes per-database locks in
* addition to lckpwdf(). However, we don't given that they
*
* Note that shadow-utils also takes per-database locks in
* addition to lckpwdf(). However, we don't given that they
- * are redundant as they
they
invoke lckpwdf() first and keep
+ * are redundant as they invoke lckpwdf() first and keep
* it during everything they do. The per-database locks are
* awfully racy, and thus we just won't do them. */
* it during everything they do. The per-database locks are
* awfully racy, and thus we just won't do them. */