summaryrefslogtreecommitdiff
path: root/src/libmbim-glib/mbim-proxy.c
diff options
context:
space:
mode:
authorRoshan Pius <rpius@chromium.org>2014-11-14 16:58:56 -0800
committerAleksander Morgado <aleksander@aleksander.es>2014-11-18 17:06:40 +0100
commit763ee0a8746e056292ddd40c74fff66bdac3c088 (patch)
tree6ce415b5d51ceb3a0bb21a5be6e7974055a7093b /src/libmbim-glib/mbim-proxy.c
parentec14ebce79fbff907ccbe3acf68838657579e152 (diff)
build: rename '--enable-mbim-proxy-username' to '--enable-mbim-username'
This shouldn't be a proxy-only setting. We're going to chown the MBIM devices to this specific user, so we'll re-use this setting for that as well.
Diffstat (limited to 'src/libmbim-glib/mbim-proxy.c')
-rw-r--r--src/libmbim-glib/mbim-proxy.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libmbim-glib/mbim-proxy.c b/src/libmbim-glib/mbim-proxy.c
index 0f86f19..ac0e87d 100644
--- a/src/libmbim-glib/mbim-proxy.c
+++ b/src/libmbim-glib/mbim-proxy.c
@@ -1064,9 +1064,9 @@ incoming_cb (GSocketService *service,
return;
}
- expected_usr = getpwnam (MBIM_PROXY_USERNAME);
+ expected_usr = getpwnam (MBIM_USERNAME);
if (!expected_usr) {
- g_warning ("Unknown user configured: %s", MBIM_PROXY_USERNAME);
+ g_warning ("Unknown user configured: %s", MBIM_USERNAME);
/* Falling back to check for root user if the configured user is unknown */
if (uid != 0) {
g_warning ("Client not allowed: Not enough privileges");
@@ -1074,7 +1074,7 @@ incoming_cb (GSocketService *service,
}
}
else if (uid != expected_usr->pw_uid) {
- g_warning ("Client not allowed: Not the expected user: %s", MBIM_PROXY_USERNAME);
+ g_warning ("Client not allowed: Not the expected user: %s", MBIM_USERNAME);
return;
}
@@ -1229,9 +1229,9 @@ mbim_proxy_new (GError **error)
struct passwd *expected_usr = NULL;
/* Only the specified user can run the mbim-proxy */
- expected_usr = getpwnam (MBIM_PROXY_USERNAME);
+ expected_usr = getpwnam (MBIM_USERNAME);
if (!expected_usr) {
- g_warning ("Unknown user configured: %s", MBIM_PROXY_USERNAME);
+ g_warning ("Unknown user configured: %s", MBIM_USERNAME);
/* Falling back to check for root user if the configured user is unknown */
if (getuid () != 0) {
g_set_error (error,
@@ -1245,7 +1245,7 @@ mbim_proxy_new (GError **error)
g_set_error (error,
MBIM_CORE_ERROR,
MBIM_CORE_ERROR_FAILED,
- "Not started with the expected user: %s", MBIM_PROXY_USERNAME);
+ "Not started with the expected user: %s", MBIM_USERNAME);
return NULL;
}