Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
D
Dnsmasq
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
Dnsmasq
Commits
9003b50b
Commit
9003b50b
authored
Mar 02, 2015
by
Simon Kelley
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix last commit to not crash if uid changing not configured.
parent
f6e62e2a
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
src/dnsmasq.c
src/dnsmasq.c
+1
-1
src/dnsmasq.h
src/dnsmasq.h
+1
-1
src/dnssec.c
src/dnssec.c
+2
-2
No files found.
src/dnsmasq.c
View file @
9003b50b
...
@@ -374,7 +374,7 @@ int main (int argc, char **argv)
...
@@ -374,7 +374,7 @@ int main (int argc, char **argv)
die
(
_
(
"unknown user or group: %s"
),
baduser
,
EC_BADCONF
);
die
(
_
(
"unknown user or group: %s"
),
baduser
,
EC_BADCONF
);
#ifdef HAVE_DNSSEC
#ifdef HAVE_DNSSEC
badtime
=
setup_timestamp
(
ent_pw
->
pw_uid
);
badtime
=
setup_timestamp
(
ent_pw
);
#endif
#endif
/* implement group defaults, "dip" if available, or group associated with uid */
/* implement group defaults, "dip" if available, or group associated with uid */
...
...
src/dnsmasq.h
View file @
9003b50b
...
@@ -1152,7 +1152,7 @@ int dnssec_chase_cname(time_t now, struct dns_header *header, size_t plen, char
...
@@ -1152,7 +1152,7 @@ int dnssec_chase_cname(time_t now, struct dns_header *header, size_t plen, char
int
dnskey_keytag
(
int
alg
,
int
flags
,
unsigned
char
*
rdata
,
int
rdlen
);
int
dnskey_keytag
(
int
alg
,
int
flags
,
unsigned
char
*
rdata
,
int
rdlen
);
size_t
filter_rrsigs
(
struct
dns_header
*
header
,
size_t
plen
);
size_t
filter_rrsigs
(
struct
dns_header
*
header
,
size_t
plen
);
unsigned
char
*
hash_questions
(
struct
dns_header
*
header
,
size_t
plen
,
char
*
name
);
unsigned
char
*
hash_questions
(
struct
dns_header
*
header
,
size_t
plen
,
char
*
name
);
int
setup_timestamp
(
uid_t
uid
);
int
setup_timestamp
(
struct
passwd
*
ent_pw
);
/* util.c */
/* util.c */
void
rand_init
(
void
);
void
rand_init
(
void
);
...
...
src/dnssec.c
View file @
9003b50b
...
@@ -402,7 +402,7 @@ static int serial_compare_32(unsigned long s1, unsigned long s2)
...
@@ -402,7 +402,7 @@ static int serial_compare_32(unsigned long s1, unsigned long s2)
static
time_t
timestamp_time
;
static
time_t
timestamp_time
;
static
int
back_to_the_future
;
static
int
back_to_the_future
;
int
setup_timestamp
(
uid_t
uid
)
int
setup_timestamp
(
struct
passwd
*
ent_pw
)
{
{
struct
stat
statbuf
;
struct
stat
statbuf
;
...
@@ -437,7 +437,7 @@ int setup_timestamp(uid_t uid)
...
@@ -437,7 +437,7 @@ int setup_timestamp(uid_t uid)
timestamp_time
=
timbuf
.
actime
=
timbuf
.
modtime
=
1420070400
;
/* 1-1-2015 */
timestamp_time
=
timbuf
.
actime
=
timbuf
.
modtime
=
1420070400
;
/* 1-1-2015 */
if
(
utime
(
daemon
->
timestamp_file
,
&
timbuf
)
==
0
&&
if
(
utime
(
daemon
->
timestamp_file
,
&
timbuf
)
==
0
&&
(
getuid
()
!=
0
||
chown
(
daemon
->
timestamp_file
,
uid
,
-
1
)
==
0
))
(
!
ent_pw
||
getuid
()
!=
0
||
chown
(
daemon
->
timestamp_file
,
ent_pw
->
pw_
uid
,
-
1
)
==
0
))
goto
check_and_exit
;
goto
check_and_exit
;
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment