From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hanna Linder Date: Sat, 17 Jan 2004 01:33:23 +0000 Subject: Re: [PATCH] set default owner/group in db. Message-Id: <8250000.1074303203@w-hlinder> List-Id: References: <32230000.1074291692@w-hlinder> In-Reply-To: <32230000.1074291692@w-hlinder> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: linux-hotplug@vger.kernel.org --On Friday, January 16, 2004 05:10:15 PM -0800 Hanna Linder wrote: > Good idea. This patch will now allow the admin to either set the default > owner and group in /etc/udev/udev.conf or it will default to root/root. > Greg, you can change udev.conf to set default_owner and default_group now. > > Hanna Oops. Here is a patch that will apply cleanly. Updated Documentation patch will do on Monday. Hanna diff -Nru a/namedev.c b/namedev.c --- a/namedev.c Fri Jan 16 18:48:55 2004 +++ b/namedev.c Fri Jan 16 18:48:55 2004 @@ -151,6 +151,22 @@ return mode; } +static char * get_default_owner(void) +{ + if (strlen(default_owner_str) = 0) { + strncpy(default_owner_str, "root", OWNER_SIZE); + } + return default_owner_str; +} + +static char * get_default_group(void) +{ + if (strlen(default_group_str) = 0) { + strncpy(default_group_str, "root", GROUP_SIZE); + } + return default_group_str; +} + static void apply_format(struct udevice *udev, unsigned char *string) { char temp[NAME_SIZE]; @@ -720,8 +736,8 @@ } else { /* no matching perms found :( */ udev->mode = get_default_mode(class_dev); - udev->owner[0] = 0x00; - udev->group[0] = 0x00; + strncpy(udev->owner, get_default_owner(), OWNER_SIZE); + strncpy(udev->group, get_default_group(), GROUP_SIZE); } dbg("name, '%s' is going to have owner='%s', group='%s', mode = %#o", udev->name, udev->owner, udev->group, udev->mode); diff -Nru a/udev.h b/udev.h --- a/udev.h Fri Jan 16 18:48:55 2004 +++ b/udev.h Fri Jan 16 18:48:55 2004 @@ -68,5 +68,7 @@ extern char udev_config_filename[PATH_MAX+NAME_MAX]; extern char udev_rules_filename[PATH_MAX+NAME_MAX]; extern char default_mode_str[NAME_MAX]; +extern char default_owner_str[OWNER_SIZE]; +extern char default_group_str[GROUP_SIZE]; #endif diff -Nru a/udev_config.c b/udev_config.c --- a/udev_config.c Fri Jan 16 18:48:55 2004 +++ b/udev_config.c Fri Jan 16 18:48:55 2004 @@ -46,6 +46,8 @@ char udev_rules_filename[PATH_MAX+NAME_MAX]; char udev_config_filename[PATH_MAX+NAME_MAX]; char default_mode_str[NAME_MAX]; +char default_owner_str[OWNER_SIZE]; +char default_group_str[GROUP_SIZE]; static void init_variables(void) @@ -117,6 +119,8 @@ set_var("udev_rules", udev_rules_filename); set_var("udev_permissions", udev_permissions_filename); set_var("default_mode", default_mode_str); + set_var("default_owner", default_owner_str); + set_var("default_group", default_group_str); } dbg_parse("%s:%d:%Zd: error parsing '%s'", udev_config_filename, lineno, temp - line, temp); ------------------------------------------------------- The SF.Net email is sponsored by EclipseCon 2004 Premiere Conference on Open Tools Development and Integration See the breadth of Eclipse activity. February 3-5 in Anaheim, CA. http://www.eclipsecon.org/osdn _______________________________________________ Linux-hotplug-devel mailing list http://linux-hotplug.sourceforge.net Linux-hotplug-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/linux-hotplug-devel