Revert "main: drop privileges right after reading the config"
This reverts commit 965664798c. It should
fix the issue in bug #87.
			
			
This commit is contained in:
		
							parent
							
								
									7f053670c0
								
							
						
					
					
						commit
						b37135524d
					
				
							
								
								
									
										15
									
								
								src/main.c
									
									
									
									
									
								
							
							
						
						
									
										15
									
								
								src/main.c
									
									
									
									
									
								
							@ -374,14 +374,6 @@ main (int argc, char **argv)
 | 
				
			|||||||
                exit (EX_SOFTWARE);
 | 
					                exit (EX_SOFTWARE);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        /* Switch to a different user if we're running as root */
 | 
					 | 
				
			||||||
        if (geteuid () == 0) {
 | 
					 | 
				
			||||||
                change_user (argv[0]);
 | 
					 | 
				
			||||||
        } else {
 | 
					 | 
				
			||||||
                log_message (LOG_WARNING,
 | 
					 | 
				
			||||||
                             "Not running as root, so not changing UID/GID.");
 | 
					 | 
				
			||||||
        }
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        ret = setup_logging ();
 | 
					        ret = setup_logging ();
 | 
				
			||||||
        if (ret != 0) {
 | 
					        if (ret != 0) {
 | 
				
			||||||
                exit (EX_SOFTWARE);
 | 
					                exit (EX_SOFTWARE);
 | 
				
			||||||
@ -427,6 +419,13 @@ main (int argc, char **argv)
 | 
				
			|||||||
                exit (EX_OSERR);
 | 
					                exit (EX_OSERR);
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        /* Switch to a different user if we're running as root */
 | 
				
			||||||
 | 
					        if (geteuid () == 0)
 | 
				
			||||||
 | 
					                change_user (argv[0]);
 | 
				
			||||||
 | 
					        else
 | 
				
			||||||
 | 
					                log_message (LOG_WARNING,
 | 
				
			||||||
 | 
					                             "Not running as root, so not changing UID/GID.");
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if (child_pool_create () < 0) {
 | 
					        if (child_pool_create () < 0) {
 | 
				
			||||||
                fprintf (stderr,
 | 
					                fprintf (stderr,
 | 
				
			||||||
                         "%s: Could not create the pool of children.\n",
 | 
					                         "%s: Could not create the pool of children.\n",
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
		Reference in New Issue
	
	Block a user