X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fshared%2Futil.h;h=b315593bba4229bb2820a78415d77130f8230329;hb=56d4fbf92eb6d8eb31c910e137224308c40dd909;hp=d3546ba1cdbaa9e4bef7ef700cc3fe16baecb40e;hpb=7c5f152acafcf0964db2f3a111195b3b2f36176f;p=elogind.git

diff --git a/src/shared/util.h b/src/shared/util.h
index d3546ba1c..b315593bb 100644
--- a/src/shared/util.h
+++ b/src/shared/util.h
@@ -1,7 +1,6 @@
 /*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
 
-#ifndef fooutilhfoo
-#define fooutilhfoo
+#pragma once
 
 /***
   This file is part of systemd.
@@ -375,6 +374,7 @@ void status_welcome(void);
 
 int fd_columns(int fd);
 unsigned columns(void);
+unsigned columns_uncached(void);
 
 int fd_lines(int fd);
 unsigned lines(void);
@@ -441,7 +441,7 @@ int fchmod_umask(int fd, mode_t mode);
 bool display_is_local(const char *display);
 int socket_from_display(const char *display, char **path);
 
-int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home);
+int get_user_creds(const char **username, uid_t *uid, gid_t *gid, const char **home, const char **shell);
 int get_group_creds(const char **groupname, gid_t *gid);
 
 int in_group(const char *name);
@@ -531,5 +531,3 @@ void warn_melody(void);
 
 int get_shell(char **ret);
 int get_home_dir(char **ret);
-
-#endif